ATO-86 and ATO-82 Add fix for channel masking in HLT cluster loading