Merge pull request #7610 from jcantrill/fix_5x_es_url

Automatic merge from submit-queue.

fix the ELASTICSEARCH_URL for kibana

The config can now be over-riden with environment vars and the default for the elasticsearch url is ELASTICSEARCH_URL

roles/openshift_logging_kibana/templates/5.x/kibana.j2

@@ -60,7 +60,7 @@ spec:
 {%   endif %}
 {% endif %}
           env:
-            - name: "ES_URL"
+            - name: "ELASTICSEARCH_URL"
               value: "https://{{ es_host }}:{{ es_port }}"
             -
               name: "KIBANA_MEMORY_LIMIT"