# Conflicts:
#	http/Provision/Config/Nginx/subdir.tpl.php

This should be set in /data/conf/global.inc with optional OFF switch in the platform and site level INI files.

“There could be several add_header directives. These directives are inherited from the previous level if and only if there are no add_header directives defined on the current level.” — http://nginx.org/en/docs/http/ngx_http_headers_module.html

# Conflicts:
#	http/Provision/Config/Nginx/subdir.tpl.php

This reverts commit 2840bc4a.

This reverts commit 20a2debd.

Issue #2798127 by memtkmcc: Improve Migrate task reliability with extra sub-tasks and fixes (BOA unfork)

Issue #2798121 by memtkmcc: Manage extra db GRANT for 127.0.0.1 to allow SSH tunneling for remote SQL access (BOA unfork)

Fixing Travis

See also https://github.com/aegir-project/tests/commit/8da70dde4fb90f49aa7c02ec92f23572af045450

This reverts commit 300661ee.