Add retries and batch=1 for ES & Kibana clients in SL

Change-Id: I0bceacecfda78c81f9fb3bf402be72883e3bc020
Related-Bug: PROD-20507
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 68fb0dd..2923682 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -834,9 +834,13 @@
         salt.cmdRun(master, 'I@elasticsearch:client', "curl -sf ${elasticsearch_vip}:${elasticsearch_port}/_cat/health | awk '{print \$4}' | grep green")
     }
 
-    salt.enforceState(master, 'I@elasticsearch:client', 'elasticsearch.client')
+    common.retry(retries,retries_wait) {
+        salt.enforceState(master, 'I@elasticsearch:client', 'elasticsearch.client', true, true, 1)
+    }
 
-    salt.enforceState(master, 'I@kibana:client', 'kibana.client')
+    common.retry(retries,retries_wait) {
+        salt.enforceState(master, 'I@kibana:client', 'kibana.client', true, true, 1)
+    }
 
     //Install InfluxDB
     if (salt.testTarget(master, 'I@influxdb:server')) {