Add rm option to docker build to remove intermediate containers Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef Component: engine