Merge branch 'master' into bfd-final

diff --cc configure.ac
Simple merge

diff --cc doc/Makefile.am
index dce13987206ddc2169578bcd8f394f9e1dfc855f,fbceb8b04cbfcbc111a0a632802d4cdc97827da2..1f6a0d87fd980be2cfdba42e1cbd122f31617f8a
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -240,7 -234,7 +240,8 @@@ EXTRA_DIST = frr-sphinx.mk 
        user/vnc.rst \
        user/vtysh.rst \
        user/zebra.rst \
 -      user/flowspec.rst \
 +      user/bfd.rst \
++  user/flowspec.rst \
        mpls/ChangeLog.opaque.txt \
        mpls/ospfd.conf \
        mpls/cli_summary.txt \

diff --cc lib/command.c
Simple merge

diff --cc lib/command.h
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc vtysh/Makefile.am
Simple merge

diff --cc vtysh/vtysh.c
Simple merge