Merge "Do not initialize anything during import phase"

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

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

diff --cc heat/tests/test_rpc_client.py
index fe42a888f801c40b7868e7d65fa6611f2614fcb5,d250c2f7d33f55b3c329be106e0099311b70e136..7783d225a471ca2ffd84189fb7865358a618575f
--- 1/heat/tests/test_rpc_client.py
--- 2/heat/tests/test_rpc_client.py
+++ b/heat/tests/test_rpc_client.py
@@@ -24,9 -24,9 +24,10 @@@ from oslo.config import cf
  import stubout
  import unittest
  
+ from heat.common import config
  from heat.common import context
  from heat.common import identifier
 +from heat.rpc import api as rpc_api
  from heat.rpc import client as rpc_client
  from heat.openstack.common import rpc
  

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