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-rate-tracer.hpp b/utils/tracers/ndn-l3-rate-tracer.hpp
index 69a8c0f..6370c26 100644
--- a/utils/tracers/ndn-l3-rate-tracer.hpp
+++ b/utils/tracers/ndn-l3-rate-tracer.hpp
@@ -139,11 +139,11 @@
   virtual void
   InData(const Data& data, const Face& face);
 
-  // virtual void
-  // SatisfiedInterests(Ptr<const pit::Entry>);
+  virtual void
+  SatisfiedInterests(const nfd::pit::Entry&, const Face&, const Data&);
 
-  // virtual void
-  // TimedOutInterests(Ptr<const pit::Entry>);
+  virtual void
+  TimedOutInterests(const nfd::pit::Entry&);
 
 private:
   void