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/other/ndn-test.cpp b/tests/other/ndn-test.cpp
index da2f334..4095f54 100644
--- a/tests/other/ndn-test.cpp
+++ b/tests/other/ndn-test.cpp
@@ -171,7 +171,7 @@
   cmd.AddValue("pit", "Perform PIT evaluation if this parameter is true",
                m_shouldEvaluatePit);
   cmd.AddValue("strategy", "Choose forwarding strategy "
-                           "(e.g., /localhost/nfd/strategy/broadcast, "
+                           "(e.g., /localhost/nfd/strategy/multicast, "
                            "/localhost/nfd/strategy/best-route, ...) ",
                m_strategy);
   cmd.AddValue("sim-time", "Simulation time", m_simulationTime);