DERBY-6945: Correct module descriptors which the coming test module will depend on; commit derby-6945-27-aa-adjustModulesForTests.diff after clean test results.