Merge "Move to the python-saharaclient"