Merge pull request #10712 from patrasar/pim_nexthop_prefix_to_pimaddr

diff --cc pimd/pim6_cmd.c
Simple merge

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_cmd_common.c
Simple merge

diff --cc pimd/pim_upstream.c
Simple merge