More specific Tazonomy canonicalisation; Allows custom vars through, strips...

More specific Tazonomy canonicalisation; Allows custom vars through, strips all per-taxonomy query vars. See #17174

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