Merge branch 'fix/selectiontest-without-mpi' into 'master'

Jö Fahlkerequested to merge
cherry-pick-940f264e into releases/2.6

[selectiontest] Clean up includes.

See merge request !373 (merged)

(cherry picked from commit 940f264e)

a5dc5ec0 [selectiontest] Clean up includes.

Merge request reports