Deny crawlers on search results pages as they may cause very high load on sites with non-English default lang because of the amount of not cached queries on the url_alias table (Nginx)

as a bonus, we improve this by using a simpler Directory directive instead of DirectoryMatch

Issue #1555398 - ensure the master server in a Pack is given a MySQL GRANT, if it was not also @server_master

Issue #1573004 by cafuego - provision-migrate fails with 'Dummy connection failed to fail: mysql: option -e' requires an argument on Debian Wheezy

Issue #1552228 by omega8cc - Nginx configuration for limit_conn should be compatible with version >= 1.1.8

Conflicts:
	aegir.make
	db/mysql/mysql_service.inc
	debian/changelog
	debian/gbp.conf
	example/basic/basic_service.inc
	http/Provision/Service/http/ssl.php
	http/nginx/nginx.conf
	http/nginx/nginx_advanced_include.conf
	http/nginx/nginx_service.inc
	http/nginx/nginx_simple_include.conf
	http/nginx/vhost.tpl.php
	http/nginx_ssl/nginx_ssl_service.inc
	http/nginx_ssl/server_ssl.tpl.php
	http/nginx_ssl/vhost_ssl.tpl.php
	http/nginx_ssl/vhost_ssl_disabled.tpl.php
	platform/provision_drupal.drush.inc
	provision.config.inc
	provision.context.inc
	provision.file.inc
	provision.info
	release.sh
	upgrade.sh.txt

Issue #1544144 by thsutton - Use $server_name instead of $host in all sites/ paths to avoid broken URLs to static files for domain aliases in D7 (Nginx).

Issue #1544144 by thsutton - Use $server_name instead of $host in all sites/ paths to avoid broken URLs to static files for domain aliases in D7 (Nginx).

Issue #1528996 by omega8cc - Nginx microcaching should use fastcgi_cache_valid with 5s only for 403 error.

Issue #1528996 by omega8cc - Nginx microcaching should use fastcgi_cache_valid with 5s only for 403 error.