vchoi_fork

Merge pull request #1815 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8

* commit '80c5068601b3339bbbee16b156b0a78974148458':
  Fix merge test issues
  HDFFV-10845 More changes from 1.10 branch
  Fix file install name
  Merge errors fixed
  Merge cleanup
  Correct test issues from merge
  Remove non-1.8 option
  Merge of HDFFV-10845, 10529 from develop