Merge "Fix delegated cert installer test" into nyc-dev