CFY-1372 change cloudify types to be compliant with tosca naming conventions
CFY-1372 cloudify types tosca naming convention
CFY-1372 change cloudify types to be compliant with tosca naming conventions
CFY-1372 cloudify types tosca naming convention
CFY-1372 tosca naming convention for cloudify types
Merge branch 'CFY-1372-tosca-naming-convention' of github.com:cloudify-cosmo/cloudify-manager into CFY-1372-tosca-naming-convention
CFY-1372 test dependencies
CFY-1372 fixed tests
CFY-1372 fixed tests
CFY-1372 cloudfiy types tosca naming conventions
Merge branch 'master' into CFY-1372-tosca-naming-convention

Conflicts:
	rest-service/dev-requirements.txt
	tests/dev-requirements.txt
CFY-1372 merge
CFY-1372 update dev reqs
Merge pull request #153 from cloudify-cosmo/CFY-1372-tosca-naming-convention

CFY-1372 change cloudify types to be compliant with tosca naming convent...