CMS-3104 ListBox ComboBox and Dropdown refactoring