Merge "[CLI] Add Kubernetes v1.17 compatibility"