improve wait for MySQL to come up during post-installation setup
Merge branch 'develop'