Miscellaneous STC adjustments

Change-Id: Ia1d5629d075646192f154b03bec6a71a8ac44dbd

@@ -13,7 +13,7 @@ state=$3
 for attempt in {1..30}; do
     onos ${node:-$OCI} scr:list  | grep $component > $aux
 
-    if grep -q $state $aux; then
+    if grep $state $aux; then
         exit 0
     else
         sleep 1

@@ -6,7 +6,7 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-export MAX_WAIT=60
+export MAX_WAIT=${ONOS_MN_TIMEOUT:-90}
 
 cmd="$1" && shift
 log="screenlog.0"

@@ -52,7 +52,7 @@
         <group name="Query2" requires="Netcfg.Post-2">
             <parallel var="${OC#}" starts="Netcfg.Query-2-${#}">
                 <!-- Check that the values made it into the config for the DHCP server -->
-                <step name="Netcfg.QueryDhcp-2-${#}"
+                <step name="Netcfg.QueryDhcp-2-${#}" delay="2"
                       exec="check-dhcp-netcfg.py ${OC#} ttl=21 lease=22 renew=23 rebind=24 delay=25 timeout=26"/>
             </parallel>
         </group>