Conflicts:
manually fixed	framework/src/main/java/org/radargun/stages/RandomDataStage.java
manually fixed 	framework/src/main/resources/radargun-1.1.xsd