Merge pull request #576 from chiragshah6/pim_dev

pimd: pim bfd support

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_neighbor.c
Simple merge

diff --cc pimd/pim_upstream.h
Simple merge

diff --cc pimd/pim_zebra.c
Simple merge