[CLEANUP] -Fixing broken jmeter tests.
Merge pull request #2028 from jeffreythomas/dev

[CLEANUP] -Fixing broken jmeter tests.