CP-11136: XenAPI = Client.Client (readability++)
CP-11136: XenAPI = Client.Client (readability++)

The seventh and last commit for this feature.
This is just to improve readability.

Signed-off-by: Thomas Sanders <c547603d2dd860735c4f0c043b1348f5c48c02f8@citrix.com>

cheng--zhang/xen-api,cheng--zhang/xen-api,cheng--zhang/xen-api,cheng--zhang/xen-api,cheng-z/xen-api,cheng--zhang/xen-api,cheng-z/xen-api,cheng-z/xen-api,cheng-z/xen-api,cheng-z/xen-api,cheng-z/xen-api,cheng-z/xen-api,cheng--zhang/xen-api,cheng--zhang/xen-api