Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
Updated the POM versions to 2.4.4
Revert "Updated the POM versions to 2.4.4"

This reverts commit c76e8b69f93b24b32d1e900c591b552e53b69dee.
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml