Fix environ substitutions in `docker commit --change ...` Upstream-commit: a5de79b435735f8027ffc98072a33a83fc8dea28 Component: engine