DERBY-6104: Port 1458256 from trunk to 10.10 branch.

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