Contrail Heat resources still fails to work on Kilo

2015-10-14 14:52:38.087 20800 ERROR heat.common.plugin_loader [-] Failed to import module heat.engine.plugins.resources.service_instance
2015-10-14 14:52:38.088 20800 CRITICAL heat-engine [-] ImportError: cannot import name log
2015-10-14 14:52:38.088 20800 TRACE heat-engine Traceback (most recent call last):
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/bin/heat-engine", line 73, in <module>
2015-10-14 14:52:38.088 20800 TRACE heat-engine srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/engine/service.py", line 273, in __init__
2015-10-14 14:52:38.088 20800 TRACE heat-engine resources.initialise()
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/engine/resources/__init__.py", line 61, in initialise
2015-10-14 14:52:38.088 20800 TRACE heat-engine _load_global_environment(global_env)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/engine/resources/__init__.py", line 66, in _load_global_environment14 14:52:38.088 20800 TRACE heat-engine _load_global_resources(env)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/engine/resources/__init__.py", line 76, in _load_global_resources0-14 14:52:38.088 20800 TRACE heat-engine manager = plugin_manager.PluginManager(__name__)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/engine/plugin_manager.py", line 58, in __init__
2015-10-14 14:52:38.088 20800 TRACE heat-engine self.modules = list(modules())
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/common/plugin_loader.py", line 98, in load_modules
2015-10-14 14:52:38.088 20800 TRACE heat-engine module = _import_module(importer, module_name, package)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/dist-packages/heat/common/plugin_loader.py", line 74, in _import_module
2015-10-14 14:52:38.088 20800 TRACE heat-engine module = loader.load_module(module_name)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/python2.7/pkgutil.py", line 246, in load_module
2015-10-14 14:52:38.088 20800 TRACE heat-engine mod = imp.load_module(fullname, self.file, self.filename, self.etc)
2015-10-14 14:52:38.088 20800 TRACE heat-engine File "/usr/lib/heat/resources/service_instance.py", line 13, in <module>
2015-10-14 14:52:38.088 20800 TRACE heat-engine from heat.openstack.common import log as logging
2015-10-14 14:52:38.088 20800 TRACE heat-engine ImportError: cannot import name log