[Completes #68201720] Includes task items in GET /api/tasks
Cleans up rescue block on task controller
Merge branch 'master' into expand_tasks_api