Fix for roles inheritance workaround for pillar