* commit '4a3998ac308c2bf24201e470c0b23f7f83f063e1':
Correct indentation in h5diff/Makefile.am.
Add "-rpath /nowhere" to *_la_LDFLAGS for plugin test libraries. This allows them to be successfully linked but not installed. The change was added for the HDF5 1.8.20 release, but is also needed for all other HDF5 branches.
* commit 'b67e626ba9095f35dd9a8f9e8ca906320f85914c':
HDFFV-10173 remove hook for noinst libs
HDFFV-10170 fix noinst for test libs
HDFFV-10173 fix compile on VS2008
Due to HDFVIEW-19 add read VL as string function
and replace it with new url for COPYING file.
Fix 2 lines in java error test expected output file where messages
include line numbers changed by reducing the copyright header by 2
lines.