Merge pull request #14221 from SmithSamuelM/sam_raet_51

Support for new SaltKeep object. Preparatory to storing keeps by name not uid