Merge commit 'd1cd5e5a63b2256eb71661f7438537e4ded7b01a' into thread-next

diff --cc proto/bgp/config.Y
index 0be50b5e9c8b1910affa3808ed6af55f84f75335,a2dfa747df6399b704c02e8a26640d0a613a2ca6..66d97e3bb1f80cc3055182b18e77f3909f764115
--- 1/proto/bgp/config.Y
--- 2/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@@ -29,9 -30,9 +29,9 @@@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, H
        GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
        STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,
        LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
 -      DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
 +      DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
        FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
-       RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, PREFER, GLOBAL)
+       RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL)
  
  %type <i> bgp_nh
  %type <i32> bgp_afi
@@@ -44,7 -45,8 +44,9 @@@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, 
  
  CF_GRAMMAR
  
 -symbol: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
+ /* Workaround for collisions between keywords and symbols */
++toksym: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
 +toksym: BGP_MED | BGP_LOCAL_PREF | SOURCE ;
  
  proto: bgp_proto '}'  ;