Merge "[NBI] Make NBI compatible with Kubernetes v1.17"