Revert "Merge branch 'revert-7f660f69' into 'master'"

This reverts merge request !601 (merged). @gruenich: Please incorporate !600 (closed) and fix the depreation warning for the CollectiveCommunication typedefs. Once this is on place and the Nightly Build tool chain runs with this branch it might be ready to be merged. But there might be other issues.