Merge branch 'master' into pim_5549

diff --cc pimd/pim_pim.c
Simple merge

diff --cc pimd/pim_rp.c
Simple merge

diff --cc pimd/pim_zebra.c
Simple merge

diff --cc pimd/pimd.c
index e76e202bd3ddf47015fc37c6872f76716c293859,bdbd251e209722581d7f44539524863db9404312..3d3f4d6aeee3e72c3f2afc303d8d0abc6935d08e
--- 1/pimd/pimd.c
--- 2/pimd/pimd.c
+++ b/pimd/pimd.c
@@@ -108,10 -108,14 +108,17 @@@ pim_vrf_enable (struct vrf *vrf
      {
        pimg = pim_instance_init (VRF_DEFAULT, AFI_IP);
        if (pimg == NULL)
-         zlog_err ("%s %s: pim class init failure ", __FILE__,
-               __PRETTY_FUNCTION__);
+         {
+           zlog_err ("%s %s: pim class init failure ", __FILE__,
+                     __PRETTY_FUNCTION__);
+           /*
+            * We will crash and burn otherwise
+            */
+           exit(1);
 -        }
++      }
++
++    pimg->send_v6_secondary = 1;
 +
-       pimg->send_v6_secondary = 1;
      }
    return 0;
  }