This branch refactors the contact exchange protocol to make it reusable for remote contacts.
Part of #1232 (closed).