[310558] Releng fixes for 3.2
1 file changed