Bring nginx config file closer to the package provided

Makes nicer diffs when they change settings

Change-Id: I43d6db54b2897b241b0c01f844e05d245b85191c
Merge "Bring nginx config file closer to the package provided"