mod_survey: fix label class and control-group class for country and category questions.
merge