Update with latest stable_proposed

Includes:

* https://github.com/openshift/kubernetes/pull/4