Jdm/master/mysql config enhancements

@nonrational @reustmd @ygoldman see inline comments on changes