Merge "Allow overriding default XtestingCI version"