Merge pull request #2025 from jeffreythomas/5.2

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

[BACKLOG-503] add empty resonse message to setAttributes
[CLEANUP] -Fixing broken jmeter tests.