Merge "bugfix: fix the docker_cleanup path"