[releng] Issue #8718: Modules branching is broken