Update trunk to match OMPI 1.7.3 due to code reviews.