Merge r574201, r574684 from trunk:

Merge r574201, r574684 from trunk:

* Also set the Vary header if a rewrite condition is true and uses a HTTP
  header, but all remaining rewrite conditions are skipped due to the [OR]
  flag.

* Add the novary flag to RewriteCond in order to prevent the appending
  of HTTP headers used in a rewrite condition to the Vary header of
  the response.

Submitted by: rpluem
Reviewed by: jim

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