1. Merge 2.4.1 to HEAD other than assessment, imsld, lorsm, and views.
2. Bump version numbers to 2.5.0d1.
2. Bump version numbers to 2.5.0d1.