Merge maint into master (FMP rekey msg1 resend cap + rekey-aware link-dead heartbeat)

src/node/tests/mod.rs

@@ -17,6 +17,7 @@ mod discovery;
 mod ethernet;
 mod forwarding;
 mod handshake;
+mod heartbeat;
 mod routing;
 mod session;
 mod spanning_tree;