Merge branch 'master' of ssh://gerrit.mcp.mirantis.com:29418/mcp/osccore-qa-testing-tools into google

 Related-PROD: PROD-30521
Change-Id: I2f17bec62ee624381bcf3d1280515221ba7d618c