[ENTESB-1768] Mixed local/public IP for OS environment