Merge "测试nginx.conf"

Change-Id: I29c27f4d0317de42aa61e07b79c7c959675e5e1b