resolving master->v3 conflicts

Merge branch 'master' into HEAD

# Conflicts:
#	.github/workflows/ci.yaml
#	CHANGES
#	README.rst
#	docs/examples/test/test_examples.py
#	nameko/__main__.py
#	nameko/amqp/publish.py
#	nameko/cli/commands.py
#	nameko/cli/run.py
#	nameko/cli/shell.py
#	nameko/cli/show_config.py
#	nameko/cli/utils/config.py
#	nameko/exceptions.py
#	nameko/messaging.py
#	nameko/rpc.py
#	nameko/standalone/events.py
#	nameko/standalone/rpc.py
#	nameko/testing/pytest.py
#	setup.py
#	test/amqp/test_publish.py
#	test/cli/test_main.py
#	test/standalone/test_event_dispatcher.py
#	test/standalone/test_rpc_proxy.py
#	test/test_entrypoints.py
#	test/test_events.py
#	test/test_messaging.py
#	test/test_rpc.py
#	test/testing/test_utils.py
#	tox.ini

README.rst

@@ -64,18 +64,6 @@ Support
 
 For help, comments or questions, please go to `<https://discourse.nameko.io/>`_.
 
-For enterprise
----------------------
-
-Available as part of the Tidelift Subscription.
-
-The maintainers of Nameko and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. `Learn more. <https://tidelift.com/subscription/pkg/pypi-nameko?utm_source=pypi-nameko&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`_
-
-
-Security contact information
-----------------------------
-
-To report a security vulnerability, please use the `Tidelift security contact <https://tidelift.com/security>`_. Tidelift will coordinate the fix and disclosure.
 
 For enterprise
 ---------------------