Cherry-pick from https://gerrit.onos.onlab.us/#/c/312/

Change default to old FlowManager dynamics

Change-Id: Ic134fb679635a937682041986cc17eb99e90808c
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
index fa1394e..4784e0b 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
@@ -51,8 +51,8 @@
 class FlowEventHandler extends Thread implements IFlowEventHandlerService,
 						 IOFSwitchListener {
 
-    private boolean enableOnrc2014MeasurementsFlows = true;
-    private boolean enableOnrc2014MeasurementsTopology = true;
+    private boolean enableOnrc2014MeasurementsFlows = false;
+    private boolean enableOnrc2014MeasurementsTopology = false;
 
     /** The logger. */
     private final static Logger log = LoggerFactory.getLogger(FlowEventHandler.class);
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index 108d945..6c09977 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -52,7 +52,7 @@
  */
 public class FlowManager implements IFloodlightModule, IFlowService, INetMapStorage {
 
-    private boolean enableOnrc2014MeasurementsFlows = true;
+    private boolean enableOnrc2014MeasurementsFlows = false;
 
     protected DBOperation dbHandlerApi;
     protected DBOperation dbHandlerInner;