Merge "Update the 2.11 release notes"