Merge "Fix unstable assertion in test_cinder_endpoints"