Merge branch 'master' of https://github.com/grid5000/reference-repository

Conflicts:
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml