Merge pull request #14320 from SmithSamuelM/sam_2014.7

salt-call raet now only uses one yard and cleans up after itself