cleanup logic to have the KeyCLI properly go through the Key-Class
cleanup logic to have the KeyCLI properly go through the Key-Class

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt