revert last commit as it appears to have borked the jbosstools-integration-tests.aggregate_master build