Merge pull request #2024 from jeffreythomas/dev

[CLEANUP] -Fixing broken rest endpoint.  This has been broken since pre ...
[BACKLOG-503] add empty resonse message to setAttributes
Merge pull request #2026 from scottyaslan/devBranch

[BACKLOG-503] add empty resonse message to setAttributes
[CLEANUP] -Fixing broken rest endpoint.  This has been broken since pre 5.1
[CLEANUP] -Fixing broken jmeter tests.