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