MDL-25988 fixed overriding of roles variable