[BACKLOG-730] Fixed some JMeter tests
Merge pull request #1991 from bmorrise/dev

[BACKLOG-730] Fixed some JMeter tests
[BACKLOG-732] - Added/Verified JMeter test results.
Merge pull request #1993 from wseyler/dev

[BACKLOG-732] - Added/Verified JMeter test results.
[BACKLOG-732] Fixed JMeter tests for FileService