hdf5

Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '93e8bbd9f47d6a2eace95f2ed3b2dd4b6336940a':
  Renamed get/set_time() calls in the tools library to avoid name clash when building static parallel HDF5 w/ static linking to OpenMPI.