KVM

Merge proposals dependent on lp://qastaging/~michaelh1/kvm/fix-boot-wrapper-axf-dir

  1. fix-boot-wrapper-axf-dir
  2. Dependent merge proposals

lp://qastaging/~michaelh1/kvm/fix-boot-wrapper-axf-dir has no merge proposals.