Merge "SonarFix-CachedRoleDAO.java"