hdf5_der

Merge branch 'trunk_merge' into cache_image
Merge trunk to cache_image: up to e61ed09aab3 [svn-r30228] dated 7/29/16.

Conflicts:
	src/H5AC.c
	src/H5ACprivate.h
	src/H5C.c
	src/H5Cpkg.h
	src/H5Cprivate.h
	src/H5Cquery.c
	src/H5HFcache.c
	test/cache.c