Workaround inconsistent device naming

Imported from xen-api.git 1812a93608b9282227af862aa8bad7d8b5a279d8

Signed-off-by: John Else <john.else@citrix.com>
Imported-by: John Else <john.else@citrix.com>