Merge "Revert "Change prod & sandbox to public IPs for Ingress/Gerrit""