Make a separation between --heat-env

Make a simple separation on '--heat-env' for overcloud and undercloud
to allow for different config to be applied that are not part of
the tripleo project.

Change-Id: I56c4ea27e1d9183f377aa96e772e235516b5ae53
Merge "Make a separation between --heat-env"