Issue #2911164 by mfernea, Jo Fitzgerald: Undo accidental commenting of message in MetadataGeneratorTest (cherry picked from commit deac2594)