Merge branch 'master' into b1

Author: mbohlool

code-of-conduct.md

@@ -0,0 +1,5 @@
+## Kubernetes Community Code of Conduct
+
+Kubernetes follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]()

setup.py

@@ -46,7 +46,7 @@
     tests_require=TESTS_REQUIRES,
     packages=['kubernetes', 'kubernetes.client', 'kubernetes.config',
               'kubernetes.watch', 'kubernetes.client.apis',
-              'kubernetes.stream', 'kubernetes.client.models'],
+              'kubernetes.client.models', 'kubernetes.stream'],
     include_package_data=True,
     long_description="""\
     Python client for kubernetes http://kubernetes.io/