Better removal of query args in canonical redirects. Only remove them when...

Better removal of query args in canonical redirects. Only remove them when they are not present in the redirect_url. fixes #20374

git-svn-id: https://core.svn.wordpress.org/trunk@20395 1a063a9b-81f0-0310-95a4-ce76da25c4cd