BUG-2383: split out AbstractPeerRoleTracker and IdentifierUtils