Merge "Cleanup before removal of conductor local apis"

diff --cc nova/tests/unit/compute/test_compute.py
Simple merge

diff --cc nova/tests/unit/compute/test_compute_mgr.py
Simple merge

diff --cc nova/tests/unit/compute/test_compute_utils.py
Simple merge

diff --cc nova/tests/unit/virt/xenapi/test_xenapi.py
Simple merge