Merge r1907505, r1908186 from trunk:

Merge r1907505, r1908186 from trunk:

* In the reverse proxy case r->filename might contain a query string if
  the nocanon option was used with ProxyPass.
  If this is the case cut off the query string as the last parameter in
  this query string might end up on an extension we take care about, but
  we only want to match against path components not against query
  parameters.

* Add CHANGES entry for r1907505 [skip ci]

Reviewed By: rpluem, ylavic, covener

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