Update to OpenMPI 1.7rc6.
Remove unneeded (and commented out) code.