hdf5_chunking_query_bmr

Merge pull request #895 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'e09ccc4a2168e79b9f7500b8ec68ed5f829c8604':
  More includes cleanup
  Cleanup overuse of include files