Merge remote-tracking branch 'origin/master'

Author: Daria Prusova

library/orm/collection/CollectionManager.php

@@ -101,7 +101,7 @@ public function getCollection($collectionName)
         $config = $this->collections[$collectionName];
 
         try {
-            $config = $this->configToArray($config, true);
+            $config = $this->configToArray($config);
         } catch (\InvalidArgumentException $e) {
             throw new UnexpectedValueException($this->translate(
                 'Configuration for collection "{collection}" is not valid.',