added a couple of test cases to cover the additional condition added to the action
Merge branch 'master' of https://github.com/TEAMMATES/repo into Issue1868
changed the test cases to become more flexible
restored null checks
Merge branch 'master' into Issue1868
[1868] Clean up InstructorFeedbackPreviewAsInstructorAction

fixes #1868