DERBY-6683: Merge 1615565 from trunk to 10.11 branch.

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