8142907: Integration of minor fixes from the build-infra project

Reviewed-by: erikj, dholmes
1 file changed