Basic alignment with async branch (#115)

* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.

* Update minor error code to reflect change within library

* Update the error output to match library

tools/libtest/h5tools_test_utils.c

@@ -613,7 +613,7 @@ test_populate_ros3_fa(void)
 
     hbool_t show_progress = FALSE;
     int     bad_version   = 0xf87a; /* arbitrarily wrong version number */
-#endif                              /* H5_HAVE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
 
     TESTING("programmatic ros3 fapl population");
 
@@ -1028,7 +1028,7 @@ test_set_configured_fapl(void)
         "",   /* user name             */
         2048, /* stream buffer size    */
     };
-#endif                    /* H5_HAVE_LIBHDFS */
+#endif /* H5_HAVE_LIBHDFS */
     unsigned n_cases = 7; /* number of common testcases */
     testcase cases[] = {
         {
@@ -1279,7 +1279,7 @@ main(void)
 
 #ifdef _H5TEST_
     h5reset(); /* h5test? */
-#endif         /* _H5TEST_ */
+#endif /* _H5TEST_ */
 
     HDfprintf(stdout, "Testing h5tools_utils corpus.\n");