CFY-1372 changed type names to be compliant with tosca
Merge branch 'CFY-1372-tosca-naming-convention' of https://www.github.com/cloudify-cosmo/cloudify-libcloud-plugin into CFY-1372-tosca-naming-convention

Conflicts:
	plugin.yaml.template