Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '6b670e353c1ea7f13ef72cc4297d9973102078bb': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '6b670e353c1ea7f13ef72cc4297d9973102078bb': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames