MDL-48197 testing: Normalise uses of noemailever and phpmailer sink