Merge from creedence into creedence-ring3

Need to pick up this change made in creedence-ring0/xen-api.git.