CLOUDIFY-2413 small changes