Tweak t/lib/bash/collect.sh and t/lib/bash/report_mysql_info.sh and add wait_for_files() to util/test-bash-functions so hopefully they'll be more stable.