Destroy ECMap instances on deactivate

Change-Id: I2437582b8d878bbf57d8447cb7d93636c9fc0246
(cherry picked from commit 0fa172fd)

@@ -252,7 +252,7 @@ public class GossipDeviceStore
 
     @Deactivate
     public void deactivate() {
-
+        devicePortStats.destroy();
         executor.shutdownNow();
 
         backgroundExecutor.shutdownNow();

@@ -137,6 +137,7 @@ public class DistributedTunnelStore
 
     @Deactivate
     public void deactivate() {
+        orderRelationship.destroy();
         tunnelIdAsKeyStore.destroy();
         srcAndDstKeyStore.destroy();
         typeKeyStore.destroy();