Kubernetes rebase to latest, split for blame and credit

Supercedes #384