updated test and framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/cloudifysource/quality/iTests/test/cli/cloudify/cloud/byon/failover/AbstractByonManagementPersistencyTest.java