Merge some changes from fork
Fix issue with modified artifact for JMeter
Merge branch 'master' of github.com:yandex-load/yandex-tank