implementing changes/fixes described in HWWATLAS-208
Small change to allow for consistent treatment of additional "channel" tags (usecase: have a separate tag for datachannel such that it doesn't include a variation suffix)
Small change to allow for consistent treatment of additional "channel" tags (usecase: have a separate tag for datachannel such that it doesn't include a variation suffix)