using NGINX_PORT instead of dev appserver port for SERVER_PORT environment variable
Merge pull request #854 from shatterednirvana/use-nginx-port-in-appserver-env

using NGINX_PORT instead of dev appserver port for SERVER_PORT env var
Merge remote-tracking branch: upstream/master