[Falcon][ONOS-2696] support method "replace" in ConsistentMap and method "notNull" in Match

Change-Id: I7c7d4644f963e52297785c2f9a5f21eff8723e61
diff --git a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
index 85d1a68a..57b36ab 100644
--- a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
+++ b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMap.java
@@ -198,6 +198,15 @@
     }
 
     @Override
+    public Versioned<V> replace(K key, V value) {
+        Versioned<V> result = version(map.replace(key, value));
+        if (map.get(key).equals(value)) {
+            notifyListeners(mapName, UPDATE, key, result);
+        }
+        return result;
+    }
+
+    @Override
     public boolean replace(K key, V oldValue, V newValue) {
         boolean replaced = map.replace(key, oldValue, newValue);
         if (replaced) {