Merge branch 'develop' into feature/faf_event_service

# Conflicts:
#	core/dbobject.class.php
#	datamodels/2.x/itop-config/config.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php

test/ItopDataTestCase.php

@@ -792,6 +792,7 @@ class ItopDataTestCase extends ItopTestCase
 		// Create a specific organization for the tests
 		$oOrg = $this->CreateOrganization('UnitTestOrganization');
 		$this->iTestOrgId = $oOrg->GetKey();
+		return $oOrg;
 	}
 
 	public function ResetReloadCount()