CLOUDIFY-2041 review fixes.