Merge "Skip CLI tests is identity v2 is not available"