Update CHANGES and UPGRADE.txt for 18.0.0