Bug 27259: Add HomeOrHoldingBranch checks where it was missing from