[releng] Issue #6676: f26 mass branching followups