Merge remote-tracking branch 'origin/support/3.0' into support/3.1

# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php

tests/php-unit-tests/unitary-tests/core/MetaModelTest.php

@@ -10,10 +10,6 @@ use MetaModel;
 /**
  * Class MetaModelTest
  *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
  * @since 2.6.0
  * @package Combodo\iTop\Test\UnitTest\Core
  */
@@ -220,6 +216,8 @@ class MetaModelTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @runInSeparateProcess
+	 *
 	 * @dataProvider enumPluginsProvider
 	 *
 	 * @param $expectedResults
@@ -267,6 +265,8 @@ class MetaModelTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @runInSeparateProcess
+	 *
 	 * @dataProvider getPluginsProvider
 	 *
 	 * @param $expectedInstanciationCalls