Fix issue by considering logged in role
Fix broken tests
Merge branch 'master' into Issue2281
Merge remote-tracking branch 'origin/master' into Issue2281
Fix test
Fix hard-coded number
[2281] Results shown to student for the contribution question is not correct