Merge pull request #3586 from nrwahl2/nrwahl2-T832
[2.1] Backport colocation fixes for cloned groups and promotion priority