[*-mysql-bootstrap:*] Rename directory to remove repeated "mysql"
Merge branch 'master' into build