CONN-1236: Whitespace fixes