CP-6172: Remove baked-in vbd XenStore paths