Merge pull request #13529 from SmithSamuelM/sam_raet_45

Fixed key management caching issues with Salt Raet