Use updated heuristic for identifying locally managed roles (#562)

Use updated heuristic for identifying locally managed roles (#562) #804