MPI fixes. After latest merges we had the MPI vs. OMP checks made twice.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  MPI fixes. After latest merges we had the MPI vs. OMP checks made twice.