Pull changes to storage layer from xen-api.git

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>