Import a couple of hunks that were missed when importing patches from xen-api

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #39 from jonludlam/CA-114922

Import a couple of hunks that were missed when importing patches from xe...