Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!

hl/c++/test/ptableTest.h

@@ -21,9 +21,9 @@
 #ifndef PTABLETEST
 #define PTABLETEST
 
+#include "h5hltest.h"
 #include "H5PacketTable.h"
 #include "H5Cpp.h"
-#include "h5hltest.h"
 
 static hid_t fileID;