Commits

[svn-r24208] Merge revisions through r24202 from trunk to vol branch Tested: jam, koala, ostrich, platypus (h5committest) There are failures on platypus (cmake) that were present previously
[svn-r24208] Merge revisions through r24202 from trunk to vol branch Tested: jam, koala, ostrich, platypus (h5committest) There are failures on platypus (cmake) that were present previously