sync to b01126322b826a15db06f6eeefeeb56dc06db7af

According to kubernetes-announce, this is the first believed-good commit after all the breaking changes.  I'm going to start my merge on this.