Merge R3 into master

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I845fdd9ae589e2f803e6ef949cec68f0db8a7a70
diff --git a/bin/undeploy-ric-platform b/bin/undeploy-ric-platform
index 574baae..a1bebc4 100755
--- a/bin/undeploy-ric-platform
+++ b/bin/undeploy-ric-platform
@@ -21,12 +21,7 @@
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-
-for component in $ROOT_DIR/../ric-platform/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/uninstall
-
-done
+$ROOT_DIR/../ric-dep/bin/uninstall