Readd ChangeLog entries for

r9-8308-g8fdde048c9e40b9ef4de14612326378d4831ac49^..r9-8311-ga0e22367235f5cd092f9d7800f17081ca4dc79e8

plus add entries for their reversion.
2 files changed