Merge pull request #16852 from estesp/overlay-cleanup

Simplify dir removal in overlay driver