Fixes 1136; Reopened from 1175 with latest changes.
Merge pull request #1233 from fmd/1136-environment-variables

+ Builder: CmdAdd and CmdEnv now respect Dockerfile-set ENV variables