[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
Merge pull request #1709 from krivera-pentaho/master

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