Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
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
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merging 2.9 into 2.10
Merge branch 'branches/rudder/2.11' of github.com:Normation/rudder into branches/rudder/2.11
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Change version of pom.xml to 2.6.17-SNAPSHOT
Change version of pom.xml to 2.10.4-SNAPSHOT
Change version of pom.xml to 2.9.8-SNAPSHOT
[Fixes #5176]: Rename rudder-front to rudder-relay-top and rudder-webapp to rudder-web
Merge pull request #566 from peckpeck/bug_5170/rudder_relay_top

[Fixes #5176]: Rename rudder-front to rudder-relay-top and rudder-webapp...
Fixes  #5185: Rename Roles properties
Merge pull request #567 from VinceMacBuche/bug_5185/Rename_properties

Fixes  #5185: Rename Roles properties
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
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5188: rename "rudder-relay-top" to "relay-top" in config file
Merge pull request #568 from VinceMacBuche/bug_5188/relay-top

Fixes #5188: rename "rudder-relay-top" to "relay-top" in config file