make dev green
Merge branch 'master' into Issue1977
Merge branch 'master' into Issue1977
[1977] BackDoorLogicTest not green due to FeedbackResponseCommentLogic

fixes #1977