Merge branch 'graffiti-sd-fix' into 'master'

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

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json

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

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

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

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml

...5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml

...d5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml