Merge branch 'display-servername' into 'develop'

fixes displaying server_name in single server setups

Closes #6474

See merge request !1701
1 job for develop
in 7 seconds and was queued for 4 seconds