Replace certificatecombobox with KeySelectionCombo

This moves back the certificatecombo code into the
certificateselectionline and removes it as an extra class.