tweak how changes are reported for 4.0.x
Merge branch '4.0'
update change log.