Backport pgbouncer update and SMF manifest