Use server_name in nginx config
Merge remote-tracking branch 'upstream/extended' into extended

Conflicts:
	provisioning/roles/common/tasks/auth-server.yml