Remember MYSQL_FLAVOR in bootstrap.sh and restore it in dev.env.
Merge branch 'master' of github.com:youtube/vitess