DERBY-5463: Port 1557823 from trunk to 10.8 branch.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.8@1557829 13f79535-47bb-0310-9956-ffa450edef68
DERBY-5463: Bump drdamaint id back  up to 1 on 10.8 branch; commit derby-5463-02-aa-setDRDAMaintIDBackTo_1.diff.

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