Conflicts:
	master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_requestSoftwareInstance.xml
	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Slave%20Instance.xml
	master/bt5/vifib_erp5/bt/revision
	master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/SlaveInstance_requestUpdateOnChange.xml
	master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/SoftwareInstance_requestDestroy.xml
	master/bt5/vifib_slap/bt/revision
	master/product/Vifib/tests/testVifibSlapWebServiceSlaveInstance.py