Merge "hswaw/kube/frab: use more unique labels for postgres service"