Merge branch 'rnou/385-fix-k9s' into 'master'

Resolve "Fix MPICH on kubernetes tests"

Closes #385

Closes #385

See merge request !298