Merge pull request #12798 from donaldsharp/rib_match_multicast

Rib match multicast

diff --cc zebra/rib.h
Simple merge

diff --cc zebra/zapi_msg.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge