Fixed: Wrong IP added in DNS zone files when the BASE_SERVER_IP and BASE_SERVER_PUBLIC_IP parameters are referring to the same IP (private IP)
(cherry picked from commit 076cacf)
(cherry picked from commit cf354db)