Consolidate all util.hpp

This deletes all lower level util.hpp and cats them
into the top level util.hpp to avoid name conflicts.

Change-Id: Ia11e4a08053a3970b0aadf21d1156ab26def36bd
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index e0c9f3d..2c9bbc2 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "conf.hpp"
-#include "dbus/util.hpp"
+#include "util.hpp"
 
 #include <algorithm>
 #include <chrono>