Cosmetic cleanups to main.cf templates and update ChangeLog