Merge "Fix map usage on py3 in v2 test_volumes_snapshots_list"