Merge "Fix CA cert tests" into nyc-dev