Commits

[svn-r25012] Merge r24793 through r25010 from trunk to multi_rd_wd_coll_io branch Other minor cleanup/fixes Tested: ummon
[svn-r25012] Merge r24793 through r25010 from trunk to multi_rd_wd_coll_io branch Other minor cleanup/fixes Tested: ummon