Jdm/master/mysql config enhancements

@nonrational @reustmd @ygoldman now PRing against OUR fork.