Change version of pom.xml to 2.10.7-SNAPSHOT
Change version of pom.xml to 2.6.19-SNAPSHOT
Refs #5586: Reindent/comment Rudder apache vhosts
Fixes #5586: Create an Apache 2.4+ compatible virtualhost
Fixes #5593: add property name for windows 2012
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5358: remove a no more use startup check for '.' in CFEngine variable
Merge pull request #619 from Kegeruneku/bug_5183/dev/5586_provide_apache2_4_compatible_vhosts

Bug 5183/dev/5586 provide apache2 4 compatible vhosts
Merge pull request #620 from ncharles/bug_5593/dev/windows_2012_name

Fixes #5593: add property name for windows 2012
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5615: Will add back cookie usage on rule table
Merge pull request #621 from fanf/bug_5358/remove_no_more_used_dot_checking

Fixes #5358: remove a no more use startup check for '.' in CFEngine variable
Fixes #5388: Fix Node/Rule tables

Add informations on number of rows for Node tables,
Add cookie management back on Rule table
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge pull request #622 from VinceMacBuche/bug_5615/cookie_not_restored_rule_table

Fixes #5615: Will add back cookie usage on rule table
Merge pull request #623 from VinceMacBuche/bug_5388/fix_node_tables

Fixes #5388: Fix Node/Rule tables
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
Fixes #5509: do not delete parent of what you delete
Merge pull request #626 from fanf/bug_5509/group_deletion_brings_havoc_in_git_config_repos_state

Fixes #5509: do not delete parent of what you delete