Remove locals() from nova/virt/libvirt package

fixes bug 1171936

Change-Id: I81198d6bc74991b184b3de2f7977ff3a9a12ac28
Merge "Remove locals() from nova/virt/libvirt package"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp