Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '2c494482eb986ce051463e96d12a661c494a9335': Minor renaming in the tools code.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '2c494482eb986ce051463e96d12a661c494a9335': Minor renaming in the tools code.