DERBY-6635: Port 1629192 (derby-6635-01-ab-noOverwrite.diff) from trunk to the 10.11 branch.

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