7.0 service groups

Merged Leandro Martinek requested to merge 7.0-service_groups into 7.0-stage

Merge request reports