Merge "Use oslo-config-2013.1b3"

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

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

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

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

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

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

diff --cc setup.py
Simple merge