Create 2.4 branch, update master to be for 2.5.0-SNAPSHOT