Bring salt.modules.mysql in line with develop