Merge pull request #1994 from bmorrise/dev

[BACKLOG-732] Fixed JMeter tests for FileService
Merge pull request #1999 from bmorrise/dev

[BACKLOG-732] Added missing JMeter tests for FileService