Merge branch 'release-v1.37' into develop

changelog.d/10269.bugfix

changelog.d/10272.bugfix

synapse/__init__.py

synapse/app/generic_worker.py

synapse/federation/federation_server.py

synapse/storage/databases/main/__init__.py

synapse/storage/databases/main/event_federation.py

synapse/storage/databases/main/lock.py

synapse/storage/schema/main/delta/59/15locks.sql

...age/schema/main/delta/59/16federation_inbound_staging.sql

sytest-blacklist

tests/storage/databases/main/test_lock.py