[next][cptest] Adapt 2pcp test to next

Merged Martin Schneider requested to merge feature/cpgrid-on-next into next

Merge request reports