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

[BACKLOG-730] Fixed some JMeter tests
[BACKLOG-732] Fixed JMeter tests for FileService