Merge "Increase timeout for flaky testCACertLoader()"