Feature 8839: Modified Installation script to install OSM with
NGUI. Default installation is with light-ui.
-n ngui will install OSM with NGUI.
Resolved merge conflict.
Added NG-UI to ci_stage_3.

Change-Id: I5fc9d036427d078ac52f5cc5e43f7a02d509b482
Signed-off-by: vijaynag <vijaynag.bs@tataelxsi.co.in>
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 740ce4c..476ee42 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -30,6 +30,7 @@
     echo -e "                     -b v2.0            (v2.0 branch)"
     echo -e "                     -b tags/v1.1.0     (a specific tag)"
     echo -e "                     ..."
+    echo -e "     -n <ui> install OSM with Next Gen UI. Valid values are <lwui> or <ngui>. If -n is not specified osm will be installed with light-ui. When used with uninstall, osm along with the UI specified will be uninstalled"
     echo -e "     -s <stack name> user defined stack name, default is osm"
     echo -e "     -H <VCA host>   use specific juju host controller IP"
     echo -e "     -S <VCA secret> use VCA/juju secret key"
@@ -109,7 +110,7 @@
 fi
 }
 
-while getopts ":b:r:c:k:u:R:l:L:K:p:D:o:m:H:S:s:w:t:U:P:A:-: hy" o; do
+while getopts ":b:r:c:n:k:u:R:l:L:K:p:D:o:m:H:S:s:w:t:U:P:A:-: hy" o; do
     case "${o}" in
         r)
             REPOSITORY="${OPTARG}"