Pull request ElementsProject/lightning#6396

Fix compile error from rebase, and some more flake fixes.

Range Diff Matrix