I'm not sure we need both client_authentization and rhsm_authentization, what about merging them to one?