Fix RHSM channel for Grizzly

Change-Id: Ic65358339def42f03b5ab840d2ce2cc683a1362e
Merge "Fix RHSM channel for Grizzly" into grizzly