Fixes #6143 and #5823 - support RHEL 7 and correct rhsm.conf config value