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