CLOUDIFY-1426 Deployment failed when using KV storage

Conflicts:

	USM/src/main/java/org/cloudifysource/usm/launcher/DefaultProcessLauncher.java