Update 2.4-SNAPSHOT to 2.5-SNAPSHOT, update 5.8-SNAPSHOT to 5.9.1-SNAPSHOT