Merge branch 'master' into sophia_network

data/grid5000/sites/sophia/servers/api-proxy.json

data/grid5000/sites/sophia/servers/api-server-devel.json

data/grid5000/sites/sophia/servers/conman.json

data/grid5000/sites/sophia/servers/dhcp.json

data/grid5000/sites/sophia/servers/dns.json

data/grid5000/sites/sophia/servers/fsophia.json

data/grid5000/sites/sophia/servers/kadeploy-devel.json

data/grid5000/sites/sophia/servers/kadeploy.json

data/grid5000/sites/sophia/servers/kavlan-1-devel.json

data/grid5000/sites/sophia/servers/kavlan-1.json

data/grid5000/sites/sophia/servers/kavlan-2.json

data/grid5000/sites/sophia/servers/kavlan-3.json

data/grid5000/sites/sophia/servers/kavlan.json

data/grid5000/sites/sophia/servers/ldap.json

data/grid5000/sites/sophia/servers/mail.json

data/grid5000/sites/sophia/servers/mysql.json

data/grid5000/sites/sophia/servers/nat.json

data/grid5000/sites/sophia/servers/oar.json

data/grid5000/sites/sophia/servers/syslog.json

data/grid5000/sites/sophia/servers/www.json