Update ChangeLog with 3.6.1 fixes so far.
(cherry picked from commit 0f2781e020d34c98bb7dec1ecef633038ae825ce)
My own ChangeLog entries, plus some cleaning up.