update changelog
remove CHANGELOG
Merge branch 'origin-1.6' into origin-1.6-for-1.7