DERBY-7031: Adjust the upgrade test to handle 10.15 (and later) as starting points for the upgrade tests; commit derby-7031-01-aa-adjustFor10.15.diff.