Can't run VHM command for Mapr cluster
Merge branch 'master' of github.com:vmware-serengeti/serengeti-ws

Conflicts:
	cli/src/main/java/com/vmware/bdd/cli/commands/ClusterCommands.java
	server/cluster-mgmt/src/main/java/com/vmware/bdd/manager/ClusterManager.java
	server/cluster-mgmt/src/main/resources/META-INF/spring/jobs/common-job-context.xml