#111719 follow up patch by multiple contributors: ensure proper XHTML id attribute values for form elements