Resynchronise with xen-api c/s f45d493e7ed9b5a60fed1db64ce52708c76465a6
Resynchronise with xen-api c/s f45d493e7ed9b5a60fed1db64ce52708c76465a6

Signed-off-by: David Scott <63c9eb0ea83039690fefa11afe17873ba8278a56@eu.citrix.com>

djs55/xenopsd-previous,simonjbeaumont/xenopsd,djs55/xenopsd,cheng--zhang/xenopsd,koushikcgit/xenopsd,koushikcgit/xenopsd,djs55/xenopsd,cheng--zhang/xenopsd,cheng--zhang/xenopsd,djs55/xenopsd-previous,simonjbeaumont/xenopsd,thomassa/xenopsd,djs55/xenopsd,johnelse/xenopsd,johnelse/xenopsd,thomassa/xenopsd,euanh/xenopsd,euanh/xenopsd,johnelse/xenopsd,simonjbeaumont/xenopsd,koushikcgit/xenopsd,thomassa/xenopsd,djs55/xenopsd-previous,euanh/xenopsd