Refs #3071 : correct the version of the maven artifact in cf-clerk
Merge pull request #1 from ncharles/arc_3070/dev/3071_set_maven_version_to_2.4.1-snapshot

Refs #3071 : correct the version of the maven artifact in cf-clerk
Merge branch 'branches/rudder/2.4.1'

Conflicts:
	pom.xml
Change pom.xml artifact version to 2.4.1
Set pom.xml artifact to 2.4.2-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.4.1

* branches/rudder/2.4:
  Change pom.xml artifact version to 2.4.1

Conflicts:
	pom.xml
Merge branch 'branches/rudder/2.4.1'

* branches/rudder/2.4.1:
  Set pom.xml artifact to 2.4.2-SNAPSHOT
  Change pom.xml artifact version to 2.4.1

Conflicts:
	pom.xml
Fixes #3122 : Upgrade Jgit to 2.1
Change version of pom.xml from 2.4.2-SNAPSHOT to 2.4.2
Fixes #3077: use modificationId in eventLog related APIs
Merging 2.4 into 2.5
Merge pull request #2 from VinceMacBuche/arc_3118/Upgrade_Jgit_to_2.1

Fixes #3118 : Upgrade Jgit to 2.1
Merge pull request #4 from VinceMacBuche/ust_3002/dev/3077_add_modificationId_in_api

Fixes #3077: use modificationId in eventLog related APIs
Refs #3163: change pom version
Merging 2.4 to 2.5
Refs #3166: correct the artefact version on branch master
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Refs #3163: change pom version
Update the POMs to prepare the Rudder 2.5.0 RC1 release
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Update the POMs to prepare the Rudder 2.5.0 RC1 release
Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0