[BACKLOG-35] -- added build changes and two test cases across two different files for jmeter test generation
Merge pull request #1706 from krivera-pentaho/dev

[BACKLOG-35] -- added build changes and two test cases across two differ...
[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
Merge pull request #1709 from krivera-pentaho/master

[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
[BACKLOG-145] - increasing tomcat version to download from 6.0.39 to 6.0.41.
Merge pull request #1710 from kurtwalker/BACKLOG-145

[BACKLOG-145] - increasing tomcat version to download from 6.0.39 to 6.0...