Updated openstack/openstack
Project: openstack/nova  5d4919e4c307cfae782d85c540e210dcdafe363b
null
Fix up import of conductor

Need to import API from nova.conductor not from nova.conductor.api
directly. This is needed so the is_local flag can be used to
determine the conductor API to use (local or rpc)

Change-Id: I9a45a705a39050b296936edc486db5c2f0aae4dc
Closes-Bug: #1308811