Merge remote-tracking branch 'origin/support/2.7' into develop

# Conflicts:
#	application/datamodel.application.xml

test/core/OQLTest.php

@@ -212,31 +212,6 @@ class OQLTest extends ItopDataTestCase
         );
     }
 
-    /**
-     * @dataProvider TypeErrorQueryProvider
-     * @depends testOQLSetup
-     *
-     * @param $sQuery
-     *
-     * @expectedException \CoreException
-     *
-     * @throws \OQLException
-     */
-    public function testTypeErrorQueryParser($sQuery)
-    {
-        $this->debug($sQuery);
-        $oOql = new OqlInterpreter($sQuery);
-        $oOql->ParseQuery();
-    }
-
-    public function TypeErrorQueryProvider()
-    {
-        return array(
-            array('SELECT A WHERE A.a MATCHES toto'),
-        );
-    }
-
-
     /**
      * Needs actual datamodel
      * @depends testOQLSetup