Follow-up r55513 and r55515: Add new message keys to maintenance script