Update CHANGELOG
Merge remote-tracking branch 'conda/master' into refactor/change-root-dir-resolution