EZP-22146: Fixing problem with memory exhausting

This patch was developed to handle a memory issue we experience with a large number of user roles