DERBY-5852 DERBY-5879 Message updates for localization
partial (mine-conflict) merge 1421972 1369173 



git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.8.3.1_testcompat@1465861 13f79535-47bb-0310-9956-ffa450edef68