Merge "Update 2.6 release notes with more trivial_rebase fixes" into stable-2.6