Change version of pom.xml to 2.9.6-SNAPSHOT
Change version of pom.xml to 2.6.14-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Change version of pom.xml to 2.10.3-SNAPSHOT
Change version of pom.xml to 2.6.15-SNAPSHOT
Change version of pom.xml to 2.9.7-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9

Conflicts:
	pom.xml
	rudder-core/pom.xml
	rudder-web/pom.xml
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10

Conflicts:
	pom.xml
	rudder-core/pom.xml
	rudder-web/pom.xml
Fixes #5111: remove javascript warning 'variable i redeclares argument'
Merge pull request #558 from ncharles/bug_5111/dev/js_warning

Fixes #5111: remove javascript warning 'variable i redeclares argument'
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Fixes #5068: correct escaping of Group name in Rule display
Merge pull request #559 from ncharles/bug_5068/dev/escape_group_name

Fixes #5068: correct escaping of Group name in Rule display
Fixes #5122: support other data from json in Group
Merge pull request #560 from VinceMacBuche/bug_5122/treat_json_params_group

Fixes #5122: support other data from json in Group
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Fixes #5169: remove dummy nova agents from demo data
Merge pull request #563 from ncharles/bug_5169/int/remove_dummy_nova_node

Fixes #5169: remove dummy nova agents from demo data