Merge branch 'stable/3.0'

Conflicts:
	ospf6d/ospf6_lsa.c
	ospfd/ospf_vty.c
	zebra/interface.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/bgp_fsm.c
Simple merge

diff --cc bgpd/bgp_packet.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc ospf6d/ospf6_area.c
Simple merge

diff --cc ospfd/ospf_apiserver.c
Simple merge

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_ifchannel.c
Simple merge

diff --cc pimd/pim_igmp.c
Simple merge

diff --cc pimd/pim_nht.c
Simple merge

diff --cc pimd/pim_register.c
Simple merge

diff --cc pimd/pim_upstream.c
Simple merge

diff --cc pimd/pim_upstream.h
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/interface.c
index 7ff782f7cc50342271bc360fe4bb72ad0eaa348b,317cc722b47aa3ee20395dccdd5bf83ebd88f9de..7b0d31338d96dea3a2830a62a931623919bdd74c
--- 1/zebra/interface.c
--- 2/zebra/interface.c
+++ b/zebra/interface.c
@@@ -708,7 -709,10 +708,11 @@@ if_delete_update (struct interface *ifp
       for setting ifindex to IFINDEX_INTERNAL after processing the
       interface deletion message. */
    ifp->ifindex = IFINDEX_INTERNAL;
 +  ifp->node = NULL;
+ 
+   /* if the ifp is in a vrf, move it to default so vrf can be deleted if desired */
+   if (ifp->vrf_id)
+     if_handle_vrf_change (ifp, VRF_DEFAULT);
  }
  
  /* VRF change for an interface */

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/zebra_rnh.c
Simple merge