Remove locals() usage from nova.virt.libvirt.volume.

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