hdf5

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

* commit '71c050f837149a0c11e0936e661047c091deaa2f':
  rename macro
  fix issues from test fail
  change condition
  pick up from Dave's fix
  leave Wswitch-default for later fix
  fix Wredundant-decls, Wswitch-default, Wdeclaration-after-statement, Wsign-compare, Wmisleading-indentation, Wshadow