Merge "Reuse already existing groups from upstream tempest config"