Allow local-config.php to override DB_HOST
Merge branch 'feature/override-db-host' into develop