CLOUDIFY-1375, Fixed merge issue. added code that went missing after merge