Merge pull request #30774 from ankush/postgres/stock

fix(postgres): minimum required changes for postgres builds