shixiong/okd @ 2bf65cdab4aa88f160d005d3b7649b22a6dceba8

OpenShift Merge Robot e5faa36d01 Merge pull request #6372 from mtnbikenc/include-to-include_tasks		7 gadi atpakaļ
..
defaults	2dade26792 openshift_logging_kibana: fix mixing paren	7 gadi atpakaļ
meta	0de559c8f2 Fix hosted vars	7 gadi atpakaļ
tasks	50751e3c5e Include Deprecation: Convert to include_tasks	7 gadi atpakaļ
templates	37636c325a dist.iteritems() no longer exists in Python 3.	7 gadi atpakaļ
vars	6575595891 Updating logging components image defaulting pattern to match openshift_logging pattern	7 gadi atpakaļ