See https://github.com/ethereum/devp2p/pull/227 Once the spec is more fully baked, implement the changes from 5.1 to 5.2