CLOUDIFY-2386 code review fixes