Merge branch 'mpi_fixes' into 'master'

Mpi fixes

Batch jobs on the COSMA4 queue (using intel compiler and MPI) do not
run. The main reason is an overrun of the cpuid array because of the
number of cores (not a power of 2). This patch attempts to fix that.

Also includes an additional fix for a incorrect size memcpy I discovered.

See merge request !12


Former-commit-id: 19f3277120365d6722cfbddc94c97cb04bda1326