DERBY-5463: Port 1557823 from trunk to 10.7 branch.

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