Reapply the multi-ip code

This patchset reapplies the multi-ip changes with a fix that corrects a bug in translating old syntax to new syntax.
This should be `ipv4` and `ipv6`, respectively, for consistency with other NixOS options.