Fix QSTools synch branch
Prepare for 2.5.0.Final release
Prepare for development of 2.5.0-build-SNAPSHOT