vchoi_fork

Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into feature/vfd_swmr

Conflicts:
	src/H5AC.c
	src/H5F.c
	src/H5Pfapl.c
Resolve conflicts for H5AC.c, H5F.c and H5Pfapl.c