shixiong/okd @ c60fbd20fa5097934c04b1403b289c0c7829da50

OpenShift Merge Robot 7c726db393 Merge pull request #7414 from ewolinetz/fix_default_image_tags		%!s(int64=7) %!d(string=hai) anos
..
default_images.yml	ff54346133 Updating default image versions to match curator	%!s(int64=7) %!d(string=hai) anos
main.yml	8287179708 Bumping up the default wait time for ES node to be yellow or green, made it configurable for larger clusters	%!s(int64=7) %!d(string=hai) anos
openshift-enterprise.yml	e6e8c13d7d Set default image tag to openshift_image_tag for services	%!s(int64=7) %!d(string=hai) anos