Merge branch 'mq-aggregator-for-v3' into thread-next

diff --cc nest/config.Y
index b3831f1d83a9cbc4fece9b3e6264986dc48cc6a8,6bd08481c367c17c5de69af87dd5a4fca5875172..ea16b8fe72f7837f39ca894bff02db4eeda9d6bd
--- 1/nest/config.Y
--- 2/nest/config.Y
+++ b/nest/config.Y
@@@ -171,9 -133,10 +171,10 @@@ CF_KEYWORDS(MPLS_LABEL, MPLS_POLICY, MP
  CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
  
  CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
-       RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL)
+       RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL, RPKI, L3VPN,
+       AGGREGATED)
  CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)
 -CF_ENUM(T_ENUM_RTD, RTD_, UNICAST, BLACKHOLE, UNREACHABLE, PROHIBIT)
 +CF_ENUM(T_ENUM_RTD, RTD_, BLACKHOLE, UNREACHABLE, PROHIBIT)
  CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID)
  CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
  CF_ENUM(T_ENUM_MPLS_POLICY, MPLS_POLICY_, NONE, STATIC, PREFIX, AGGREGATE, VRF)