Merge remote-tracking branch 'upstream/master' into configurable-wait-time-for-green-status

Conflicts:
	ebs_deploy/__init__.py
	ebs_deploy/commands/zdt_deploy_command.py