DERBY-6692: Port 1616299 from trunk to 10.11 branch.

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