Carry across some changes from the OMPI master to support inventory monitoring and hetero operations