Merge Cloudify new code with original changes