Merge pull request #13938 from SmithSamuelM/sam_raet_49

Added stale yard keep directory cleanup behavior to master and minion
Merge remote-tracking branch 'upstream/develop' into sam_raet_49