Updates for changes to build system for OpenMPI