Fix wrong recipient type for template questions
Fix tests
Merge branch 'Issue2277' - hotpatch for: Receiver type of 'team peer eval" Q5 should be 'Giver's team members'