Merge "Sonar fix in RoleApp.Java"