CLOUDIFY-2514 remove bad code
CLOUDIFY-2514 use different branch of common