Merge branch '6.13' into 7.5

NB! this merge removes all changes done in #2740 as 7.x changes for this is handled seperatly in #2749.

eZ/Publish/Core/Repository/ContentTypeService.php

@@ -111,7 +111,7 @@ public function __construct(
      *
      * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup
      */
-    public function createContentTypeGroup(ContentTypeGroupCreateStruct  $contentTypeGroupCreateStruct)
+    public function createContentTypeGroup(ContentTypeGroupCreateStruct $contentTypeGroupCreateStruct)
     {
         if (!$this->repository->canUser('class', 'create', $contentTypeGroupCreateStruct)) {
             throw new UnauthorizedException('ContentType', 'create');