Merge branch 'cmaster-next' into vtysh-grammar

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_encap.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc ospfd/ospf_ri.c
index 87d8f596f936f2db463b3145193299bb09374324,65659709b2a2d23f89a9743f5e452291895bf23d..30d203f5b50d37b4fe477f71ce720d4f48fbe46a
--- 1/ospfd/ospf_ri.c
--- 2/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@@ -1650,9 -1652,12 +1652,11 @@@ ospf_router_info_register_vty (void
    install_element (VIEW_NODE, &show_ip_ospf_router_info_pce_cmd);
  
    install_element (OSPF_NODE, &router_info_area_cmd);
 -  install_element (OSPF_NODE, &router_info_as_cmd);
    install_element (OSPF_NODE, &no_router_info_cmd);
    install_element (OSPF_NODE, &pce_address_cmd);
+   install_element (OSPF_NODE, &no_pce_address_cmd);
    install_element (OSPF_NODE, &pce_path_scope_cmd);
+   install_element (OSPF_NODE, &no_pce_path_scope_cmd);
    install_element (OSPF_NODE, &pce_domain_cmd);
    install_element (OSPF_NODE, &no_pce_domain_cmd);
    install_element (OSPF_NODE, &pce_neighbor_cmd);