Enable optional channel when RHSM is used

Also enabling invalid (folsom) channel has been removed

Change-Id: I7ff7692830a833d5b5a2873a9e91581c7a3e1d65
Fixes: rhbz#978651
Merge "Enable optional channel when RHSM is used"