TS-2656 Determine server connection scheme immediately before connecting
Add TS-2656 to CHANGE, and minor indentation fixes.