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