KRACOEUS-7883 fixing JSPs
Merge pull request #683 from jhulslander/KRACOEUS-7883-QuestionToQuestionnaire

KRACOEUS-7883 fixing JSPs