Comment 7 for bug 1839365

Pushed to master, rel_3_5, and rel_3_4. Thanks, Shula and Terran!

Per https://stackoverflow.com/questions/45362950/header-or-legend, the fieldset could probably be taken out entirely, along with the legend tag, but that can be the subject of another patch.