Order chronologically: move entry for recent s2_clnt.c/s2_srvr.c fixes