Merge branch 'master' into wip

data/grid5000/sites/nancy/clusters/graphite/graphite.json

...d5000/sites/nancy/clusters/graphite/nodes/graphite-1.json

...d5000/sites/nancy/clusters/graphite/nodes/graphite-2.json

...d5000/sites/nancy/clusters/graphite/nodes/graphite-3.json

...d5000/sites/nancy/clusters/graphite/nodes/graphite-4.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json

...grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json

.../grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json