Bring master ChangeLog up to speed wrt 3.4 fixes
(cherry picked from commit 3e1dc941612f63d751ac499146fbeda77320e86d)