NFD+model+apps+helper+tests: Upgrade NFD and related changes

Based on NFD:commit:2fc649bfc67b93b4191cfbee5bcd70330bfb48f0 (version 0.3.4)

Change-Id: I89f5182600467171797af4f8f83e1edffe14ad95
Refs: #3125
diff --git a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
index d5f14ee..ed60016 100644
--- a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
@@ -19,6 +19,8 @@
 
 #include "helper/ndn-strategy-choice-helper.hpp"
 
+#include "ns3/ndnSIM/NFD/daemon/fw/strategy.hpp"
+
 #include "../tests-common.hpp"
 
 namespace ns3 {
@@ -90,7 +92,7 @@
 // Install(Ptr<Node> node, const Name& namePrefix, const Name& strategy);
 BOOST_AUTO_TEST_CASE(InstallBuiltInStrategyOnNode)
 {
-  StrategyChoiceHelper::Install(getNode("A2"), "/prefix", "/localhost/nfd/strategy/broadcast");
+  StrategyChoiceHelper::Install(getNode("A2"), "/prefix", "/localhost/nfd/strategy/multicast");
 
   Simulator::Stop(Seconds(5.0));
   Simulator::Run();
@@ -110,7 +112,7 @@
   nodes.Add(getNode("A1"));
   nodes.Add(getNode("A2"));
 
-  StrategyChoiceHelper::Install(nodes, "/prefix", "/localhost/nfd/strategy/broadcast");
+  StrategyChoiceHelper::Install(nodes, "/prefix", "/localhost/nfd/strategy/multicast");
 
   Simulator::Stop(Seconds(5.0));
   Simulator::Run();
@@ -126,7 +128,7 @@
 // InstallAll(const Name& namePrefix, const Name& strategy);
 BOOST_AUTO_TEST_CASE(InstallAllBuiltInStrategy)
 {
-  StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/broadcast");
+  StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/multicast");
 
   Simulator::Stop(Seconds(5.0));
   Simulator::Run();