Merge proposals dependent on lp://qastaging/~tribaal/livecd-rootfs/yakkety-fix-ova-manifest

lp://qastaging/~tribaal/livecd-rootfs/yakkety-fix-ova-manifest has no merge proposals.