Comment 2 for bug 1060454

This works for me. My only concern is that the whole interface for editing User Setting Types is a footgun and this does nothing to help that. Pushed to master with a wrapped upgrade script and a minimal release note.