Merge "Add timeout for cloudify-manager deployment"