ONOS-2854 Fixed a few bugs and made tiny improvements to shell scripts.

Change-Id: I624dc05300944dbc8b1f408bf725c49ff96f68c2
diff --git a/tools/test/bin/ogroup-opts b/tools/test/bin/ogroup-opts
index 41842bd..f02b7a8 100644
--- a/tools/test/bin/ogroup-opts
+++ b/tools/test/bin/ogroup-opts
@@ -44,7 +44,7 @@
   fi
 }
 
-complete -F _cell-opts cell
+complete -F _cell-opts cell vicell
 
 
 # Tab completion settings for onos-create-app.
diff --git a/tools/test/bin/onos-service b/tools/test/bin/onos-service
index cc69491..35764e6 100755
--- a/tools/test/bin/onos-service
+++ b/tools/test/bin/onos-service
@@ -34,7 +34,6 @@
 
 case $2 in 
     start|stop|restart|status)
-
         # Select the target
         if [ "${1}" = "--cell" ]; then
             nodes=$(env | sort | egrep "OC[0-9]+" | cut -d= -f2)