CmdAdd and CmdEnv now respect Dockerfile-set ENV variables

Reopened from https://github.com/dotcloud/docker/pull/1175