Merge "Fix test_snapshot_list_param_marker when using predefined user"