shixiong/okd @ 137e348d4ed1bf3561514009389ae72015d30c8d

OpenShift Merge Robot 447ec08f82 Merge pull request #5384 from joelddiaz/node-fact-filter		%!s(int64=7) %!d(string=hai) anos
..
oo_filters.py	b2fdc1cb5e Creating structure to warn for use of deprecated variables and set them in a single location before they are no longer honored	%!s(int64=7) %!d(string=hai) anos
openshift_version.py	4b8f66c37b Cleanup old deployment types	%!s(int64=7) %!d(string=hai) anos