Jdm/master/mysql config enhancements

@nonrational @reustmd @ygoldman now PRing against OUR fork.
can you fix this guy while you're at it? thanks!