CFY-1025 comment out diamond test for now
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-manager