Resync with xen-api c/s f45d493e7ed9b5a60fed1db64ce52708c76465a6