Merge pull request #2804 from kssoman/bgp_fix

When redistribute options are changed, call bgp_redistribute_unreg()

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge