CA-110508: Fixed xenCert for iscsi mpath tests.
CA-110609: Make XenCert compatible with clearwater.
Merge branch 'CA-110609'