Merge "test: Add more consistency when cleaning docker containers/images"