[TEST] - Fixing broken jMeter tests.
Merge pull request #2021 from jeffreythomas/dev

[TEST] - Fixing broken jMeter tests.