Bug 20936: (QA follow-up) Use Branches template plugin