vchoi_fork

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

* commit '16b909a7488d8288206dd0bb7cf9ef7036d7f543':
  Update release notes about H5get_alloc_stats() and H5get_free_list_sizes().
  Was checking the wrong compiler macro.
  Correct failure when allocation tracking are disabled.
  Remove VCS merge conflict
  Revise API for H5get_alloc_stats() to take a struct instead of separate values.
  Add routines to query the library's free list sizes and allocation stats.