- merge the two policy related patches
- Remove unneeded test scripts patches in order to run more tests - Remove unneeded test data modifications from the spec file