Don't always just append env vars, replace defaults with ones from config
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #4412 from crosbymichael/fix-env-clobber

Don't always just append env vars, replace defaults with ones from confi...