Fix merge

inc/commondbconnexity.class.php

@@ -89,6 +89,7 @@ abstract class CommonDBConnexity extends CommonDBTM {
    /// Disable auto forwarding information about entities ?
    static public $disableAutoEntityForwarding   = false;
 
+   /*
     * @since 9.4
     *
     * @param string  $itemtype the type of the item to look for

inc/commondbtm.class.php

@@ -184,6 +184,7 @@ class CommonDBTM extends CommonGLPI {
    function __construct () {
    }
 
+   /*
     * Return the table used to store this object
     *
     * @param string $classname Force class (to avoid late_binding on inheritance)

inc/plugin.class.php

@@ -132,6 +132,7 @@ class Plugin extends CommonDBTM {
       }
    }
 
+   /*
     * Init a plugin including setup.php file
     * launching plugin_init_NAME function  after checking compatibility
     *