Issue 1389 - Discourse: Don't run queries for site settings if the correct value is already set

--HG--
extra : rebase_source : 888c3e1c6ad5b16261b036c273f9e8009b106bbb
1369 - Integrate ensure_depdendencies.py script
Issue 1374 - Don't hardcode web handlers for multiplexer

--HG--
extra : rebase_source : dbe5bbd057b754d2e0e74203515d268522e335e4
Noissue - Update server: Fixed wrong option names in sitescripts.ini file
Merge branch 'upstream'
Travis - Create minimal config for travis-ci.org
Merge remote-tracking branch 'origin/master' into 122-external-node-classifier

Conflicts:
	.travis.yml
	Vagrantfile
	dependencies
	ensure_dependencies.py
Merge branch '122-external-node-classifier' into 122-dns-entries