Merge "Maintenance script to wrap the mysql binary"