[releng] PR #8088: Changes for F30 Mass Rebuild