Merge "Make CLAMP compatible with Kubernetes v1.17"