Merge pull request #2941 from jestabro/cleanup-wait
image-tools: T6016: wait for umount in cleanup function