GS-11239 Fix problem with teardown-cloud

Conflicts:
	src/main/java/org/cloudifysource/quality/iTests/test/cli/cloudify/cloud/ec2/persistence/Ec2PersistencyWithTwoManagersTwoFailuresTest.java