Bug 690307 - make trimURL not generate URLs that parse back into search queries, r=mak

--HG--
extra : rebase_source : ef509eef3a3427288ba204b32046c4565f3c5cc2