Add workaround for ATS adding extra args (uh=f) to requests in EI, which
breaks the long query handling when we try to reassemble the url.

remove uneeded imports

Addresses the case of http://foo.com? both in the normal encoding/decoding
case and in the case of someone adding a question mark with no args to
a request uri after it has been encoded

Changed to explicitly check for query.length == 0

RB=155677
R=mtagle,adubman,jbetz,sihde,si-dev
A=sihde
Merge branch 'tunnel'
Fixed testModifiiedQuestionQuery

RB=156746
R=mtagle,si-dev
A=sihde