Merge branch 'master' into pim_5549

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_iface.h
Simple merge

diff --cc pimd/pim_vty.c
Simple merge

diff --cc pimd/pim_zebra.c
Simple merge

diff --cc pimd/pimd.c
Simple merge

diff --cc pimd/pimd.h
index 8dc58990229f2fc99e34ce342179741c0e0a4213,69aee28f8f86cbca70ee5edd902978e9e1d53fca..7febc38fa7a9539dac084a7cdf7fd90c8dc052e6
--- 1/pimd/pimd.h
--- 2/pimd/pimd.h
+++ b/pimd/pimd.h
@@@ -240,8 -243,7 +243,10 @@@ struct pim_instanc
    afi_t afi;
    vrf_id_t vrf_id;
    struct hash *rpf_hash;
 +
+   void *ssm_info; /* per-vrf SSM configuration */
++  
 +  int send_v6_secondary;
  };
  
  extern struct pim_instance *pimg; //Pim Global Instance