Cherry-pick of "Merge branch 'HDF5Updates-1.0-20171123' into '1.0'" into master
HDF5 Updates/Improvements, 1.0 branch (2017.11.23.)
See merge request !187 (merged)
HDF5 Updates/Improvements, 1.0 branch (2017.11.23.)
See merge request !187 (merged)