Update for nginx 1.4

Not 100% what changed again in the syntax but this combination,
while quite long and redundant, seems to at least work.

Change-Id: I86d56aa3d829daad8283eb06199930983f080ace
Merge "Update for nginx 1.4"