Fixed some regressions

Author: dantleech

resources/config/dist/doctrine.yml

@@ -3,5 +3,3 @@ doctrine:
         driver:   %database_driver%
         path:     %database_path%
         charset:  UTF8
-    orm:
-        auto_mapping: true

resources/config/dist/phpcrodm.php renamed to resources/config/dist/phpcr_odm.php

@@ -1,3 +1,3 @@
 <?php
 
-$loader->import(CMF_TEST_CONFIG_DIR.'/dist/phpcrodm.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/dist/phpcr_odm.php');

resources/config/phpcr_odm.php

@@ -109,6 +109,6 @@ protected static function createKernel(array $options = array())
             $options['environment'] = 'phpcr';
         }
 
-        parent::createKernel($options);
+        return parent::createKernel($options);
     }
 }