Re-enable the sort and update the golds

basice2e/clients.goldoutput/client100.txt

basice2e/clients.goldoutput/client101.txt

basice2e/clients.goldoutput/client110.txt

basice2e/clients.goldoutput/client111.txt

basice2e/clients.goldoutput/client13.txt

basice2e/clients.goldoutput/client18.txt

basice2e/clients.goldoutput/client18_rekey.txt

basice2e/clients.goldoutput/client20.txt

basice2e/clients.goldoutput/client21.txt

basice2e/clients.goldoutput/client25.txt

basice2e/clients.goldoutput/client26.txt

basice2e/clients.goldoutput/client31.txt

basice2e/clients.goldoutput/client35.txt

basice2e/clients.goldoutput/client36.txt

basice2e/clients.goldoutput/client42.txt

basice2e/clients.goldoutput/client43.txt

basice2e/clients.goldoutput/client45.txt

basice2e/clients.goldoutput/client52.txt

basice2e/clients.goldoutput/client53.txt

basice2e/clients.goldoutput/client56.txt