CLOUDIFY-2335 fix wrong comment and partial error message formatting errorr