hdf5

Merge pull request #2123 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'f2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8':
  Correct assignment
  Fix java include, h5watch and remove clang tool.
  Add missing filenames