Merge "Add unit tests for glance v2 service clients"