Merge pull request #16177 from SmithSamuelM/2014.7_sam4

Clean up RAETChannel changes to support different usages