jmeter updated
Merge branch '2.2.0' of https://github.com/phresco/framework into 2.2.0