shixiong/okd @ 32b7b0aba720502c528d38af74a7b6163d0ec6fa

OpenShift Bot dc9786a202 Merge pull request #4263 from sosiouxme/20170522-fix-docker-test-flake		7 gadi atpakaļ
..
integration	dc9786a202 Merge pull request #4263 from sosiouxme/20170522-fix-docker-test-flake	7 gadi atpakaļ
unit	ff8356b926 Move Python unit tests to subdirectory	8 gadi atpakaļ
openshift_version_tests.py	51ffcb739c Standardize all Origin versioning on 3.6	8 gadi atpakaļ