Bump version to 3.1rc1
Merge branch 'master' into CFY-1372-tosca-naming-convention

Conflicts:
	cosmo_tester/resources/blueprints/nodecellar_ec2/blueprint_ec2.yaml