Merge pull request #2021 from jeffreythomas/dev

[TEST] - Fixing broken jMeter tests.
[CLEANUP] -Fixing broken rest endpoint.  This has been broken since pre 5.1