Fix building of all opam packages for xs-opam's CI#6377

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

psafont:forktestspsafont/xen-api:forktestsCopy head branch name to clipboard