[310558] Releng fixes for 3.2
3 files changed