Update nginx config

Upstream changes etc.

Change-Id: I57edf214ca40b21829ac39c82ae83c11e3968143