daemon+rib: Merge nrd and nfd into a single process (separate threads)

Change-Id: I41952d5b8ee29f109130c570e0d13ccad6970d2f
Refs: #2489
diff --git a/tools/nfd-stop.sh b/tools/nfd-stop.sh
index ed55929..bdbcf12 100755
--- a/tools/nfd-stop.sh
+++ b/tools/nfd-stop.sh
@@ -6,7 +6,7 @@
   -h)
     echo Usage
     echo $0
-    echo "  Stop NFD and RIB Management daemon"
+    echo "  Stop NFD"
     exit 0
     ;;
   -V)
@@ -20,5 +20,4 @@
     ;;
 esac
 
-sudo killall nrd
 sudo killall nfd