Moved demo app back to main onos repo. Fixed broken build in DatabasePerfInstaller.

Change-Id: I382d0a62c646c1e93fcf1ca57ffbd847abb48e0c
diff --git a/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java b/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
index 430211f..771e156 100644
--- a/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
+++ b/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
@@ -103,7 +103,10 @@
         appId = coreService.registerApplication("org.onosproject.nettyperf."
                                                         + nodeId);
 
-        cmap = storageService.createConsistentMap("onos-app-database-perf-test-map", SERIALIZER);
+        cmap = storageService.<String, String>consistentMapBuilder()
+                .withName("onos-app-database-perf-test-map")
+                .withSerializer(SERIALIZER)
+                .build();
         taskExecutor = Executors.newFixedThreadPool(NUM_TASK_THREADS, groupedThreads("onos/database-perf", "worker"));
         log.info("Started with Application ID {}", appId.id());
         start();