Follow-up r58079: Add new messages to maintenance scripts