DERBY-6000: Port 1465600 from trunk to 10.8 branch.

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