Sync to the OMPI trunk r32369
Sync to OMPI trunk r32372