Merge remote-tracking branch 'origin/6.x-2.x' into 2.3.x-dev

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