Add tests to increase coverage in FeedbackQuestionsLogic
Merge branch 'master' into Issue1931
Merge branch 'master' into Issue1931
Refactor code
More changes to remove need to catch exception.
Made requested changes
Merge branch 'master' into Issue1931
[1931] Clean up FeedbackQuestionsLogic

fixes #1931