shixiong/okd @ 580128cf729e4b302913f55e5c422bae3b167154

OpenShift Merge Robot ba7784d7ca Merge pull request #7757 from ewolinetz/es5_changes		7 éve
..
defaults	f857a66e7c allow setting of kibana env vars	7 éve
meta	801779eeb6 Relocate filter plugins to lib_utils	7 éve
tasks	983f2c776c Updating for es5.x image naming and removing restriction for origin only for tech preview	7 éve
templates	983f2c776c Updating for es5.x image naming and removing restriction for origin only for tech preview	7 éve
vars	54dccb5529 Updating default image tags to be only vX.Y for origin installs	7 éve