start merging Jonathan's IPv6 patches (01-defines, 02-ipv6-cli)