Merge "[COMMON] fix primary PVC for postgres template"