Merge remote-tracking branch 'origin/master' into babel

diff --cc configure.ac
Simple merge

diff --cc lib/command.c
index 661629325d484d72e4896d7d8e0c5419643622ec,eb163f6189c931db15bab78e06f380c24adb8d0d..835c27cddc1f8009a72e43d1b127f67b8fd445d9
--- 1/lib/command.c
--- 2/lib/command.c
+++ b/lib/command.c
@@@ -1487,10 -1300,7 +1301,8 @@@ DEFUN (config_end
      case RIP_NODE:
      case RIPNG_NODE:
      case EIGRP_NODE:
 +    case BABEL_NODE:
      case BGP_NODE:
-     case BGP_ENCAP_NODE:
-     case BGP_ENCAPV6_NODE:
      case BGP_VRF_POLICY_NODE:
      case BGP_VNC_DEFAULTS_NODE:
      case BGP_VNC_NVE_GROUP_NODE:

diff --cc lib/command.h
Simple merge

diff --cc lib/log.c
Simple merge

diff --cc vtysh/Makefile.am
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc vtysh/vtysh.h
Simple merge

diff --cc vtysh/vtysh_config.c
Simple merge