Issue #2358977 by mrP - [nginx] Aegir redirection to non-install url leads to sites/$server_name/files 404 errors (sub-dir config sync)

Issue #2358977 by mrP - [nginx] Aegir redirection to non-install url leads to sites/$server_name/files 404 errors.

This reverts commit 3c5c0d4a.

Sync with Apache config required.

Issue #2163979 - Check if field_info_field_map() is available to not break support for old D7 versions.

Herman van Rink authored May 30, 2014 and Jon Pugh committed Sep 26, 2014

Issue #2266997 by helmo, cweagans: Added Do not automatically enable update module when installing a site.

Conflicts:
	Provision/Config/Drupal/provision_drupal_settings.tpl.php
	http/Provision/Config/Nginx/Ssl/vhost_ssl_disabled.tpl.php
	http/Provision/Config/Nginx/vhost_disabled.tpl.php

Nginx: Sanitize aliases in vhost_disabled.tpl.php to avoid: 'nginx: [warn] server name "foo.com/bar" has suspicious symbols'