DERBY-4855: Port 1430291 from trunk to 10.7 branch.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.7@1430301 13f79535-47bb-0310-9956-ffa450edef68
DERBY-4855: Port 1430417 from trunk to 10.7 branch.

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