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

diff --cc nest/mpls.c
index 40c611d3933137842b418401ef8600b3947fc40a,ba9854fd9d173cd123dad0a7f89135381eee931f..85fce996163b26a7092ded1b915a5d0899813576
--- 1/nest/mpls.c
--- 2/nest/mpls.c
+++ b/nest/mpls.c
@@@ -780,9 -788,10 +787,9 @@@ mpls_get_fec_by_destination(struct mpls
    fec = sl_allocz(mpls_slab(m, 0));
  
    fec->hash = hash;
 -  fec->class_id = class_id;
    fec->rta = rta;
  
-   fec->label = mpls_new_label(m->domain, m->handle);
+   fec->label = mpls_new_label(m->domain, m->handle, 0);
    fec->policy = MPLS_POLICY_AGGREGATE;
  
    DBG("New FEC rta %u\n", fec->label);

diff --cc nest/mpls.h
Simple merge