Merge branch '6400-server-enabled' into 'develop'

Fix undefined variable firewall_server_enabled and xmpp_server_enabled, #6400

See merge request !1653
1 job for develop in 17 seconds (queued for 4 seconds)