Merge "ExternalAccessRoleServiceImpl: Fixed sonar issue"