Fix clean up image skipping images if there were child paths#36899

Abacn merged 1 commit intoapache:masterapache/beam:masterfrom

Abacn:fix-cleanup-imageAbacn/beam:fix-cleanup-imageCopy head branch name to clipboard