Merge "Make COMMON/MONGO compatible with Kubernetes v1.17"