Make sure ENV instruction within build perform a commit each time Upstream-commit: 5928ed5d45a393fbd627b3c06eca56eeabca7504 Component: engine