Start of new ospf6d merge from Zebra.
4 files changed