Merge "Update 2.11 release notes" into stable-2.11