Merge pull request #5339 from josharian/issue-5321 netops: handle intact query parameters in service_suffix removal