More infrastructure for always addressing peers by JID and associating peers with incoming client certs #640 #633