Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay

cleanup/fix integration-cli for overlay in overlay