Merge "default nginx-proxy config for OSS"