[trunk] Backport toplevel changes from 1.5 over to trunk. Remove hand-generated CHANG...