CmdAdd and CmdEnv now respect Dockerfile-set ENV variables