[releng] PR #8106: FTBFS changes for F30