Merge proposals

os-xenapi-drivers has no merge proposals.