CFY-1308 refactor tests
Merge branch 'master' of https://github.com/cloudify-cosmo/cloudify-system-tests