Merge branch 'release/2.4.0.1'
Merge branch 'release/2.6.1.0'
Fix: Time was updating on previous task instead of current task #2170

* This patch includes changes in passing task.work.id in TimesheetLine
  work field replacing task.id

Task ID: project-7/task-2170
Release hotfix version 2.6.1.1
Merge branch 'hotfix/2.6.1.1' into develop