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/docs/source/fw.rst b/docs/source/fw.rst
index c98e134..4e57e1f 100644
--- a/docs/source/fw.rst
+++ b/docs/source/fw.rst
@@ -35,9 +35,9 @@
 |                                            | guaranteed to be equivalent.                                                                 |
 +--------------------------------------------+----------------------------------------------------------------------------------------------+
 +--------------------------------------------+----------------------------------------------------------------------------------------------+
-| ``/localhost/nfd/strategy/broadcast``      |  :nfd:`Broadcast Strategy <nfd::fw::BroadcastStrategy>`                                      |
+| ``/localhost/nfd/strategy/multicast``      |  :nfd:`Multicast Strategy <nfd::fw::MulticastStrategy>`                                      |
 |                                            |                                                                                              |
-|                                            |  The broadcast strategy forwards every Interest to all                                       |
+|                                            |  The multicast strategy forwards every Interest to all                                       |
 |                                            |  upstreams, indicated by the supplied FIB entry.                                             |
 +--------------------------------------------+----------------------------------------------------------------------------------------------+
 +--------------------------------------------+----------------------------------------------------------------------------------------------+
@@ -59,11 +59,11 @@
     +====================+===============================================+
     | ``/``              | ``/localhost/nfd/strategy/best-route``        |
     +--------------------+-----------------------------------------------+
-    | ``/localhost``     | ``/localhost/nfd/strategy/broadcast``         |
+    | ``/localhost``     | ``/localhost/nfd/strategy/multicast``         |
     +--------------------+-----------------------------------------------+
     | ``/localhost/nfd`` | ``/localhost/nfd/strategy/best-route``        |
     +--------------------+-----------------------------------------------+
-    | ``/ndn/broadcast`` | ``/localhost/nfd/strategy/broadcast``         |
+    | ``/ndn/multicast`` | ``/localhost/nfd/strategy/multicast``         |
     +--------------------+-----------------------------------------------+
 
 
@@ -73,7 +73,7 @@
       .. code-block:: c++
 
          StrategyChoiceHelper::Install(nodes, prefix,
-                                       "/localhost/nfd/strategy/broadcast");
+                                       "/localhost/nfd/strategy/multicast");
 
 
 .. _Writing your own custom strategy: