DERBY-6073: Ported 1446675 from trunk to 10.9 branch.

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