Issue #2373923 by griz - https redirect problem with Nginx (fix tested)
Issue #2358977 by mrP - [nginx] Aegir redirection to non-install url leads to sites/$server_name/files 404 errors (sub-dir config sync)
Merge branch 'refs/heads/6.x-2.x' into 2.3.x-dev