[releng] PR #8182: Remove rebuild_strategy for branching