Resolve conflict between 516a99e and abed2a3 (#2698)
Resolve conflict between 516a99e and abed2a3 (#2698)

516a99e moved the client CCS message earlier in the handshake,
which caused a test in abed2a3 to fail.
PKRoma/s2n,awslabs/s2n,wcs1only/s2n,awslabs/s2n,PKRoma/s2n,awslabs/s2n,wcs1only/s2n,PKRoma/s2n,wcs1only/s2n,PKRoma/s2n,awslabs/s2n,wcs1only/s2n,awslabs/s2n,wcs1only/s2n,wcs1only/s2n,PKRoma/s2n,PKRoma/s2n,PKRoma/s2n,wcs1only/s2n,awslabs/s2n,wcs1only/s2n,PKRoma/s2n