Merge "Remove CBS and Consul dependencies from CBSClient lib"