CLOUDIFY-1869 Changed operationId to deploymentId. Fixed some check-style issues.