Merge "Fix postgresql haproxy timeouts"