[releng] PR #8562: Changes for F31 Mass Rebuild