Resolved Conflicts:
	CMakeLists.txt
	api/gmxapi/CMakeLists.txt
	api/gmxapi/cpp/mdsignals.cpp
	api/gmxapi/cpp/session.cpp
	api/gmxapi/cpp/sessionresources.h
	api/gmxapi/cpp/workflow.cpp
	api/gmxapi/include/gmxapi/exceptions.h
	api/gmxapi/include/gmxapi/md/mdsignals.h
	api/legacy/include/gromacs/fileio/trxio.h
	cmake/gmxManageCudaAwareMPI.cmake
	docs/CMakeLists.txt
	docs/conf.cmakein.py
	docs/release-notes/2022/major/miscellaneous.rst
	python_packaging/src/CMakeLists.txt
	python_packaging/src/gmxapi/_logging.py
	python_packaging/src/gmxapi/abc.py
	python_packaging/src/gmxapi/exceptions.py
	python_packaging/src/gmxapi/export_exceptions_0_2_0.cpp
	python_packaging/src/gmxapi/pycontext.cpp
	python_packaging/src/gmxapi/simulation/read_tpr.py
	python_packaging/src/gmxapi/typing.py
	python_packaging/src/test/test_commandline.py
	python_packaging/src/test/test_operation.py
	src/config.h.cmakein
	src/gromacs/domdec/dlb.cpp
	src/gromacs/domdec/dlbtiming.h
	src/gromacs/fileio/gmx...