Merge pull request #8959 from daverodgman/branches-3.6lts-2.28

Update BRANCHES for 3.6 - 2.28 backport