Merge "Fixing test "test_verify_glance_version_no_v2_with_v1_1""