Comment 10 for bug 1626955

I'm going to mark this one fix released, then we can raise a follow-up bug if the use-case described in comment #2 and comment #4 proves to be a priority (e.g merging into the default roles_data vs requiring the whole file to be defined). The feedback I've got so far is that what we landed is working OK and may therefore be enough.