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

[BACKLOG-730] Fixed some JMeter tests