(QE-25) fix :environment options being used as puppet argument

Create a master hash of environment variables from --ENV and :environment.