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

[TEST] - Fixing broken jMeter tests.