[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter