DERBY-6945: Misc cleanup related to message localization; commit derby-6945-32-aa-messageLookupCleanup.diff.