Merge "BasicAuthAccountServiceImpl: Sonar Issue"