Workaround inconsistent device naming
Workaround inconsistent device naming

Imported from xen-api.git 1812a93608b9282227af862aa8bad7d8b5a279d8

Signed-off-by: John Else <37b74501daa612e48fea94f9846ed4ddeb6a8f07@citrix.com>
Imported-by: John Else <37b74501daa612e48fea94f9846ed4ddeb6a8f07@citrix.com>

cheng--zhang/xenopsd,simonjbeaumont/xenopsd,euanh/xenopsd,thomassa/xenopsd,cheng--zhang/xenopsd,djs55/xenopsd,thomassa/xenopsd,thomassa/xenopsd,djs55/xenopsd,euanh/xenopsd,djs55/xenopsd,johnelse/xenopsd,johnelse/xenopsd,djs55/xenopsd-previous,cheng--zhang/xenopsd,koushikcgit/xenopsd,simonjbeaumont/xenopsd,djs55/xenopsd-previous,koushikcgit/xenopsd,simonjbeaumont/xenopsd,johnelse/xenopsd,djs55/xenopsd-previous,koushikcgit/xenopsd,euanh/xenopsd