Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '73d7f7e7d37b869ce9c39cc8e648ef50d563fc93': Updated the threadsafety test to use error macros instead of asserts.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '73d7f7e7d37b869ce9c39cc8e648ef50d563fc93': Updated the threadsafety test to use error macros instead of asserts.