Fix help bubble in manage questions and typo in edit survey
Fix conflicts after merging MH-615 to dev