Default network readiness fix conflicts after rebase

types/types.go

@@ -43,6 +43,8 @@ type NetConf struct {
 	LogFile       string                   `json:"logFile"`
 	LogLevel      string                   `json:"logLevel"`
 	RuntimeConfig *RuntimeConfig           `json:"runtimeConfig,omitempty"`
+	// Default network readiness options
+	ReadinessIndicatorFile string `json:readinessindicatorfile`
 }
 
 type RuntimeConfig struct {