This starts with #1211 and does the other updates necessary for
bumping us to Kubernetes 1.4.