Merge "Replace glance.client with python-glanceclient"