Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade

services/contacts/config/settings.defaults.coffee

@@ -8,4 +8,4 @@ module.exports =
 			host: process.env["LISTEN_ADDRESS"] or "localhost"
 
 	mongo:
-		url: "mongodb://#{process.env["MONGO_HOST"] or "localhost"}/sharelatex"
+		url: process.env['MONGO_CONNECTION_STRING'] or "mongodb://#{process.env["MONGO_HOST"] or "localhost"}/sharelatex"