CLOUDIFY-1887 Fixed silly merge issue