Merge "Skip additional test if 'xenapi_apis' flag is False"