BACKLOG-5421
BACKLOG-5423

Fix site servername to match rules in dnsmasq