DERBY-590: Attempt to fix upgrade tests which were broken by derby-590-15-aa-requireHardUpgrade.diff; commit derby-590-16-aa-adjustUpgradeTest.diff.

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