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