Pull in 2.5 version upgrade files

For 2.5.0 and 2.5.1

Signed-off-by: Dan Wells <dbw2@calvin.edu>