Fixes #3587: Add Archives entry to bootstap.ldif
Fixes #3593 : No commit when restoring HEAD
Merge pull request #211 from VinceMacBuche/bug_3587/Add_Archives_to_bootstrap.ldif

Fixes #3587: Add Archives entry to bootstap.ldif
Merge pull request #213 from VinceMacBuche/bug_3593/no_commit_when_restore_head

Fixes #3593 : No commit when restoring HEAD
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6