HDDS-564. Update docker-hadoop-runner branch to reflect changes done in HDDS-490. Contributed by Namit Maheshwari.

scripts/starter.sh

@@ -80,7 +80,8 @@ fi
 
 if [ -n "$ENSURE_SCM_INITIALIZED" ]; then
    if [ ! -f "$ENSURE_SCM_INITIALIZED" ]; then
-      /opt/hadoop/bin/ozone scm -init
+      # Improve om and scm start up options
+      /opt/hadoop/bin/ozone scm --init || /opt/hadoop/bin/ozone scm -init
    fi
 fi
 
@@ -91,7 +92,8 @@ if [ -n "$ENSURE_OM_INITIALIZED" ]; then
       # Could be removed after HDFS-13203
       echo "Waiting 15 seconds for SCM startup"
       sleep 15
-      /opt/hadoop/bin/ozone om -createObjectStore
+      # Improve om and scm start up options
+      /opt/hadoop/bin/ozone om --init || /opt/hadoop/bin/ozone om -createObjectStore
    fi
 fi