Fixes #3137 : change the syntax of the cfengine variable
Fixes #3153: update the LDAP init script to use new internal Rudder variable format
Fixes #3177 : fix rollback of rollback
Merge pull request #82 from VinceMacBuche/bug_3177/fix_rollback_of_rollback

Fixes #3177 : fix rollback of rollback
Merge pull request #63 from ncharles/ust_3137/dev/3149_change_internal_rudder_variables

Fixes #3137 : change the syntax of the Rudder variable
Merge pull request #64 from ncharles/ust_3137/int/3153_change_ldap_init_ldif

Fixes #3153: update the LDAP init script to use new internal Rudder variable format
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3177 : fix rollback of rollback
  Fixes #3153: update the LDAP init script to use new internal Rudder variable format
  Fixes #3137 : change the syntax of the cfengine variable