Prepare for 2.5.0-build-4 release
Prepare for development of 2.5.0-build-SNAPSHOT