DERBY-6748: Port 1628960 (derby-6748-01-ab-engineAndToolsMessageChanges.diff) from trunk to the 10.11 branch.

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