Merge pull request #1699 from TheBlueMatt/2022-08-announcement-rework

diff --cc lightning/src/ln/chanmon_update_fail_tests.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
Simple merge

diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge

diff --cc lightning/src/ln/functional_tests.rs
Simple merge

diff --cc lightning/src/ln/payment_tests.rs
Simple merge

diff --cc lightning/src/util/events.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge