make those tests pass!
Merge branch 'COOK-3900' into SSLUpdates