Sweeping !22558 from 21.0 to master. Update for 2018 PbPb overlay configuration

Update for 2018 PbPb overlay configuration

See merge request !22558 (merged)

Merge request reports

Loading