hdf5_der

Merge branch 'develop' into page_buffering
Merge trunk to page_buffering branch: up till b6bb7c123a0 dated Oct 17, 2016.
Tested on kite, osx1010test, kituo, mayll, emu, platypus, ostrich, moohan, quail.

Conflicts:
	src/H5Fint.c
	test/Makefile.am