CLOUDIFY-2600 bug fixes