Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'b0aa2c037ebb742db520e4e9a72e06d21c4afa27': Restore fix of test assert fail eror undone by later commit.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'b0aa2c037ebb742db520e4e9a72e06d21c4afa27': Restore fix of test assert fail eror undone by later commit.