model+utils: Enable SatisfiedInterests and TimedOutInterests trace sources in L3Protocol

This commit also fixes L3Tracers to re-enable use of SatisfiedInterests and
TimedOutInterests traces

Change-Id: Ib657a3fdba941d022a33d789e4d10c3547d232ff
Refs: #2349
diff --git a/utils/tracers/ndn-l3-tracer.cpp b/utils/tracers/ndn-l3-tracer.cpp
index 6fc6b16..e19439b 100644
--- a/utils/tracers/ndn-l3-tracer.cpp
+++ b/utils/tracers/ndn-l3-tracer.cpp
@@ -62,11 +62,12 @@
   l3->TraceConnectWithoutContext("OutData", MakeCallback(&L3Tracer::OutData, this));
   l3->TraceConnectWithoutContext("InData", MakeCallback(&L3Tracer::InData, this));
 
-  // // satisfied/timed out PIs
-  // l3->TraceConnectWithoutContext("SatisfiedInterests",
-  //                                MakeCallback(&L3Tracer::SatisfiedInterests, this));
-  // l3->TraceConnectWithoutContext("TimedOutInterests",
-  //                                MakeCallback(&L3Tracer::TimedOutInterests, this));
+  // satisfied/timed out PIs
+  l3->TraceConnectWithoutContext("SatisfiedInterests",
+                                 MakeCallback(&L3Tracer::SatisfiedInterests, this));
+
+  l3->TraceConnectWithoutContext("TimedOutInterests",
+                                 MakeCallback(&L3Tracer::TimedOutInterests, this));
 }
 
 } // namespace ndn