Merge "Sonar-OrganizationFactory.java"