Fix pipeline after number of services changed functionality

Merged Piotr Gawron requested to merge fix-pipeline into devel_16.2.x

Merge request reports