rebase to k8s v0.6.2
Merge branch 'rebase_05x' of github.com:mesosphere/kubernetes-mesos into rebase_05x