[Code clean up] -- Fixed some broken Jmeter tests to keep the project current.
Merge pull request #1301 from brendan-lynch/Jmeter

[Code clean up] -- Fixed some broken Jmeter tests to keep the project cu...