CFY-1318 update system tests
Merge branch 'master' into CFY-1318-tosca-interfaces
Merge branch 'master' into CFY-1318-tosca-interfaces
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-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