CLOUDIFY-1942 enabled test
added s3_mirror property
Merge remote-tracking branch 'origin/master'
CLOUDIFY-1918 disable SelfHealingDisabledTest.java.
added dummy check
Merge remote-tracking branch 'origin/master'
added logstash and s3 mirror variables
disable wire logging
Merge remote-tracking branch 'remotes/origin/master' into logstash-branch

Conflicts:
	src/main/scripts/bin/sgtest-cmd.sh
	src/main/scripts/deploy/bin/client-sgtest-executor.sh
	src/main/scripts/deploy/bin/startSG.sh