Move the FQDN keyword conversion to the child scripts level.
Update for custom runner cron schedule.
Update for e-mail template.
Simplify installers download.
Prepare code transition to support new in/up modes: Remote DB Head, WEB Head and/or mixed types, clusters etc.
Set/update _BRANCH_BOA on the fly via wrappers.
Merge branch 'refs/heads/master' into test

Conflicts:
	aegir/conf/upgrademail.txt
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Improve support for db/web clusters.
Merge branch 'refs/heads/master' into cluster
Fix typo.
Do not hardcode hostname in /etc/hosts
Do not export LC_CTYPE on initial install.
Remove duplicate lines from /etc/default/locale
Fix typo.
Do not force Solr 4 on CI instances in cluster mode.
Sync cluster modes.
Sync cluster modes.