Add support for deploy.d script overrides in local.d.
Update secure apache configuration in script.
Update output and spacing.
Merge branch 'master' into oneiric