revive correct versions of files after OMPI trunk r32603 sync