reverted two message strings for historical sake
updates for config behavior changes for bugs:
Bug 988476 - eliminate extra parameters from subscription-manager
config --list/--set/--remove
Bug 993202 - rhsm.conf default configuration server.ca_cert_dir should
be moved to rhsm.ca_cert_dir