Merge commit '14cf8454' into thread-next

diff --cc conf/confbase.Y
Simple merge

diff --cc filter/config.Y
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/proto.c
index 3565f229d49885bb084eb8c640907a1827da73fa,1aeea96c599708a5cb638e2738c3d2f48e4a247b..1fd3cc7bc16bbd40958654cf4b0dc363bd1e9ed4
--- 1/nest/proto.c
--- 2/nest/proto.c
+++ b/nest/proto.c
@@@ -1203,14 -906,17 +1203,17 @@@ channel_reconfigure(struct channel *c, 
    if (import_changed && !channel_reloadable(c))
      return 0;
  
-   if (import_changed || export_changed)
-     log(L_INFO "Reloading channel %s.%s", c->proto->name, c->name);
- 
    if (import_changed)
 -    channel_request_reload(c);
+   {
+     log(L_INFO "Reloading channel %s.%s for import", c->proto->name, c->name);
 +    channel_request_reload(c, NULL);
+   }
  
    if (export_changed)
 -    channel_request_feeding(c);
+   {
+     log(L_INFO "Reloading channel %s.%s for export", c->proto->name, c->name);
 +    channel_refeed(c, NULL);
+   }
  
  done:
    CD(c, "Reconfigured");

diff --cc proto/bgp/packets.c
Simple merge