[sr-dev] git:master:60485701: pv_headers: rework pvh_remove_header_param, take two