Merge pull request #1998 from bmorrise/5.2-dev

[BACKLOG-732] Added missing JMeter tests for FileService