Several minor changes
Several minor changes were made (e.g. in the ChangeLog file a line was removed because its related bug had later a final fix).
(cherry picked from commit 382462097eaf0d9f6c0e143f67e19fb848295711)