DERBY-6513: Port 1579330 from the 10.10 branch to the 10.9 branch.

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