# Conflicts: # src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java # src/test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java # src/test/java/org/alfresco/rest/workflow/tasks/AddTaskVariablesSanityTests.java # src/test/java/org/alfresco/rest/workflow/tasks/GetTaskFormModelSanityTests.java