This commit was SVN r6327.
This commit was SVN r6326.
ompi/runtime, for consistency and parallel-ness will orte/runtime. Also remove a few useless #includes along the way. This commit was SVN r6317.