Update CHANGES and doc to reflect changes in master

10 jobs for 275-add-permanent-option-to-disable-server-side-cookies in 8 minutes and 17 seconds (queued for 8 seconds)