Merge "Add docker-root parameter to find Dockerfile"