Ca 134757 creedence

Backport of xapi-project/xenopsd#77