Merge "Remove nova v2 client in ListSnapshotImagesTest"