Merge "Update the Nova Endpoint information for Cinder"