DERBY-6588: Merge 1615140 from trunk to 10.11 branch.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.11@1615143 13f79535-47bb-0310-9956-ffa450edef68
[RELEASE CHECKIN] Derby release ID set to: 10.11.1.0

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.11@1615146 13f79535-47bb-0310-9956-ffa450edef68
[RELEASE CHECKIN] Derby release ID set to: 10.11.1.1

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