ea-1254

Fixes required for the refactorisation of xen-api-libs