Refs #9323 OSHMail revamp: update the OSHMail collage generator