Make install more robust
Reset default hostname
Merge branch 'master' into entityids

Conflicts:
	scripts/install_openconext.sh