Fix compatibility with nginx-1.7.8+.

Change-Id: Ia95af27d9e3f11b1132da3692d17042e63219d47
Signed-off-by: Piotr Sikora <piotr.sikora@frickle.com>
Update CHANGES (releng for 2.2).

Change-Id: I66181f280ba44cf598f09c5cdae2e8c1084d3f0d
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>