Fold in post-3.8.3, pre-4.0 changelog entries from release branches.