MAINT manual backport of whats_new.rst reorg