Merge r649169, r649239, r649840, r649922, r650026, r661452, r661459 from trunk:

Make mod_proxy_ajp aware of the nocanon envvar


handle ? in cases where nocanon is in effect


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


Set at init time, and combine comments


Typo.


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


* Set at init time and combine comments.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663593 13f79535-47bb-0310-9956-ffa450edef68