CLOUDIFY-1926 added a message
CLOUDIFY-1826 fix merge