Merge "Use the Environment from within the engine"

diff --cc heat/engine/parser.py
Simple merge

diff --cc heat/engine/resource.py
Simple merge

diff --cc heat/engine/resources/autoscaling.py
Simple merge

diff --cc heat/engine/stack_resource.py
Simple merge

diff --cc heat/tests/test_engine_service.py
Simple merge

diff --cc heat/tests/test_instance.py
Simple merge

diff --cc heat/tests/test_metadata_refresh.py
Simple merge

diff --cc heat/tests/test_security_group.py
Simple merge

diff --cc heat/tests/test_vpc.py
Simple merge

diff --cc heat/tests/test_waitcondition.py
Simple merge

diff --cc heat/tests/utils.py
Simple merge