CP-5129: Bring xcp-rrdd functionally up to date with xen-api.git/master