Merge branch 'master' into wip

Rakefile

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json

...d5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json

data/grid5000/sites/lille/clusters/chirop/chirop.json

.../grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json

.../grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json

.../grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json

.../grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json

.../grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json

data/grid5000/sites/lille/network_equipments/sw-1.json

data/grid5000/sites/lille/network_equipments/sw-admin6.json

...grid5000/sites/lille/network_equipments/sw-chiclet-2.json

data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json

data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json