Use the already defined OSC_MPIEXEC var.
Merge branch 'fix9' into develop