CLOUDIFY-1944 bug fixes