Merge "Add ConsistencyGroup Exceptions in tempest"