DERBY-6151: Port 1464934 from trunk to 10.8 branch.

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