CLOUDSTACK-5423: Fixed 5423

Conflicts:
	tools/marvin/marvin/deployAndRun.py