CFY-1025 setup diamond test skeleton
CFY-1025 more setup
CFY-1025 modify test a little
Merge branch 'master' into CFY-1025-diamond-integration

Conflicts:
	cosmo_tester/framework/cfy_helper.py
CFY-1025 fix test
CFY-1025 small changes in test
CFY-1025 remove workaround dsl bug in test
Merge branch 'master' into CFY-1025-diamond-integration
CFY-1025 update test to run on openstack
CFY-1025 small fixes
CFY-1025 use scripts to execute stuff
Merge pull request #50 from cloudify-cosmo/CFY-1025-diamond-integration

Cfy 1025 diamond integration