This commit was SVN r24154.
* Update places where orte-free builds have failed This commit was SVN r23891.