remove locals() from virt/hyperv package

Also fix logging issue with missing local variable for
existing placeholder

fixes bug 1171936

Change-Id: I6e32364983372945c2b69bb92cd3a96689b7a53c
Merge "remove locals() from virt/hyperv package"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp