Merge pull request #3072 from arik-so/arik/gossip-v2-parsing

Reintroduce addresses to NodeAnnouncementInfo.

diff --cc lightning/src/onion_message/messenger.rs
Simple merge

diff --cc lightning/src/routing/gossip.rs
Simple merge

diff --cc lightning/src/routing/router.rs
Simple merge