CFY-1095 change nodecellar blueprint filename
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-system-tests
CFY-1095 change nodecellar blueprint filename
CFY-1318 update system tests
CFY-1095 have the same test for both openstack and ec2 nodecellar example
Merge branch 'master' into CFY-1318-tosca-interfaces
CFY-1095 modify blueprint for nodecellar tests
Merge branch 'master' into CFY-1318-tosca-interfaces
CFY-1095 modify blueprint for nodecellar tests
Merge branch 'master' into CFY-1318-tosca-interfaces
Merge pull request #53 from cloudify-cosmo/CFY-1318-tosca-interfaces

CFY-1318 update system tests
CFY-1095 different blueprint per cloud
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-system-tests
CFY-1229 added keypair type to the neutron galore test; also modified neutron galore test to be more stable, as now the port's security groups dont depend on order
Merge pull request #54 from cloudify-cosmo/CFY-1229-openstack-keypair-type

CFY 1229 openstack keypair type
Bump version to 3.1rc1
Bump version to 3.1rc1
CFY-1372 cloudify types tosca naming convention
Bump version to 3.1rc1
Merge branch 'master' into CFY-1372-tosca-naming-convention

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