Remove ordering query args

If these are not removed right after use they will affect the remaining
queries on the page.
Merge remote-tracking branch 'upstream/master'
Merge pull request #5639 from tamarazuk/master

[product_category] shortcode: Remove ordering query args