Merge "Make ROBOT compatible with Kubernetes v1.17"