shixiong/okd @ e0e10698184c9a7cf4bf65787771686e46d26603

Scott Dodson 7dcc6292e2 Merge pull request #6064 from mtnbikenc/consolidate-init		7 gadi atpakaļ
..
integration	e5f4823d6e Playbook Consolidation - Initialization	7 gadi atpakaļ
unit	ff8356b926 Move Python unit tests to subdirectory	8 gadi atpakaļ
openshift_version_tests.py	346ce4fc59 Removed old version code	7 gadi atpakaļ