Sync to latest OMPI trunk, includes fix for hwloc header files