Reorder RH registration and fix RHSM deploy to not match Satellite case