Merge "测试nginx.conf"

Change-Id: Icb495fa3348bbe1ada23778d3afc8c280b8ff230