Fixed bug where NeighborRPC was overwritten with RelayNeighborRPC in the
dispatcher on the relay peer, extracted registering dispatch handler
into separate method and other small changes