Fixes #3585: Do not archive System elements, do not archive serial for
Rules and nodes for dynamic groups
Merge pull request #210 from VinceMacBuche/bug_3585/Do_not_archive_system_and_some_other_datas

Fixes #3585: Do not archive System elements, do not archive serial for
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPActiveTechniqueRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPActiveTechniqueCategoryRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPActiveTechniqueRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupCategoryRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala
	rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala
	rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
Fix typo merge
Merge branch 'branches/rudder/2.6'