tests: sync common testing infrastructure with ndn-cxx and NFD

And upgrade waf to version 2.0.21

Change-Id: Id713e0f3035badd97ca7fc03f76e50085b9a266c
diff --git a/tests/dump/ndndump.t.cpp b/tests/dump/ndndump.t.cpp
index 44e2998..f266d92 100644
--- a/tests/dump/ndndump.t.cpp
+++ b/tests/dump/ndndump.t.cpp
@@ -20,7 +20,6 @@
 
 #include "tools/dump/ndndump.hpp"
 
-#include "tests/identity-management-fixture.hpp"
 #include "tests/test-common.hpp"
 
 #include <net/ethernet.h>
@@ -66,7 +65,7 @@
   std::streambuf* originalBuffer;
 };
 
-class NdnDumpFixture : public IdentityManagementFixture
+class NdnDumpFixture
 {
 protected:
   NdnDumpFixture()