Conflicts:
	bt5/erp5_test_result/bt/revision
	bt5/erp5_test_result/bt/template_document_id_list
	bt5/erp5_test_result/bt/template_extension_id_list
(cherry picked from commit 63c1fc09)

Conflicts:

	bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.py
	bt5/erp5_test_result/bt/revision