Merge 2.3.0 candidates

Update master with latest 2.3.0-release-candidates changes, fixed merge conflicts with CHANGELOG.md, version.js, and DataList.js