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

diff --cc proto/l3vpn/l3vpn.c
index af5f106ab6d947990d1a4fba3e16a2db52d439ac,38441208713c625d73c73941041dd90eae66f898..7b3d86d2a650b996bca20d0bb0d330fcdfe3e9ea
--- 1/proto/l3vpn/l3vpn.c
--- 2/proto/l3vpn/l3vpn.c
+++ b/proto/l3vpn/l3vpn.c
@@@ -458,7 -431,11 +458,11 @@@ l3vpn_reconfigure(struct proto *P, stru
    }
    */
  
 -  proto_setup_mpls_map(P, RTS_L3VPN, 1);
+   /* Update pointers to config structures */
+   p->import_target = cf->import_target;
+   p->export_target = cf->export_target;
+ 
 +  proto_setup_mpls_map(P, RTS_L3VPN);
  
    return 1;
  }