Merge "Add IPv6 support for the management network"