Add support for multiple environment files

This patch adds support for heat to accept multiple -e commandline
arguments. The environment files are merged, with newer values
overwriting older ones.

Change-Id: I01e2baf8dea3bafb1ac6eac34f281c5ff86bf4aa
Closes-Bug: 1350403
Merge "Add support for multiple environment files"