1) CMD Utils JAR/SoapUI Integration changes 2) Correct merge conflicts