Merge proposals dependent on lp://qastaging/~therp-nl/therp-backports/server-6.1-lp923645-unlink_timesheet_lines_fails

1. server-6.1-lp923645-unlink_timesheet_lines_fails
2. Dependent merge proposals