MDL-29378 Fix regression in the Survey/COLLES P+A module
This basically reverts the commit
5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).
This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
