Tidy up the locale.gen handling. There is no real format in this file:

just lines which might be comments, might be human-readable-text, or
might be example locales. Instead of modifying any comment-lines,
write enabled locales at the bottom of the file, while matching
very loosely with the comment lines from the file.

FIXES #940 (insofar as that is fixable)