Merge "Remove dire config-dbsupport-postgres warning"