merge hdf5 1.8 revision 25595 to cmake branch