Strip p, page_id, attachment_id, post_type, pagename, and name from redirect...

Strip p, page_id, attachment_id, post_type, pagename, and name from redirect query if we get a hit on a 404-guessed permalink. fixes #20374

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