Merge branch '4.6'

Author: micszo

composer.json

@@ -77,6 +77,7 @@
     },
     "conflict": {
         "doctrine/dbal": "2.7.0",
+        "doctrine/orm": "2.20.7",
         "ezsystems/ezplatform-kernel": "*",
         "ezsystems/ezpublish-legacy": "*",
         "friendsofphp/php-cs-fixer": "3.5.0",