Merge "[HOLMES] Use common postgres for holmes"