Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from trunk:

* mod_rewrite: Preserve the query string when [proxy,noescape]

PR 45247

Submitted by: tdonovan
Reviewed by: rpluem, niq, tdonovan



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