unify nginx config files
Merge pull request #7578 from bbodenmiller/patch-8

Unify Nginx files to match as closely as possible