Merge "add htmlform-no and htmlform-yes messages for generic yes-no questions"