Conflicts:
	product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/PyData%20Script/proxy_role_view.xml
	product/ERP5/bootstrap/erp5_core/bt/template_action_path_list