Merge "Switch to upstream postgres docker image for OSS tooling"