Fixes for OpenEMPI update

This pull request addresses corrections suggested in https://github.com/jembi/rhea-shr-adapter/pull/44/files
Please review and comment :-)