Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup

integ-cli: Add a few missing context cleanups