Merge "Cloudify REST Client unit tests"