KRACOEUS-7334
Merge pull request #328 from anithapolus/KRACOEUS-7334

KRACOEUS-7334
KRACOEUS-7334: line endings
Merge pull request #329 from leoherbie/line_endings

KRACOEUS-7334: line endings
KRACOEUS-6955 : Common Questionnaire question
KRACOEUS-6955 : Common Questionnaire question - fix upon comments