bug fix
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-system-tests