CA-397599 XSI-1704 #5984

lindig merged 2 commits intoxapi-project:masterxapi-project/xen-api:masterfrom

lindig:private/christianlin/CA-397599lindig/xen-api:private/christianlin/CA-397599Copy head branch name to clipboard