merge 3.20.9 into 3.21 Fix conflict in unittest_postgres.py by changing sources configuration in PostgresTimeoutConfiguration.__init__ so it happens *after* setUpModule().

addressbook
basket
blog
book
calendar
comment
company
email
file
folder
i18ncontent
keyword
link
mailinglist
person
tag
timeseries
vcsfile