rebase kubernetes for demo

This is the existing kubernetes, plus a cherry-pick of https://github.com/GoogleCloudPlatform/kubernetes/pull/2074 and https://github.com/GoogleCloudPlatform/kubernetes/pull/2140 which are needed for the demo to work properly.  In particular, https://github.com/GoogleCloudPlatform/kubernetes/pull/2140 is needed for https://github.com/openshift/origin/pull/309.