Introducing a simple mechanism for adding global configuration to Nginx which, for example, can be used to preserve environment variables.
Merge branch 'master' of github.com:javereec/passenger-docker

Conflicts:
	image/config/nginx.default.env