Merge "allow using image uuid for instance resource"

diff --cc heat/common/exception.py
Simple merge

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

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

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