Merge remote-tracking branch 'upstream/master' into feature/console

Conflicts:
	library/Zend/Mvc/Service/ModuleManagerFactory.php
	library/Zend/Mvc/View/Http/ViewManager.php
	tests/Zend/Mvc/ApplicationTest.php

src/View/HelperConfiguration.php → src/View/HelperConfig.php

@@ -10,7 +10,7 @@
 
 namespace Zend\Navigation\View;
 
-use Zend\ServiceManager\ConfigurationInterface;
+use Zend\ServiceManager\ConfigInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\View\HelperPluginManager;
 
@@ -21,7 +21,7 @@
  * @package    Zend_Navigation
  * @subpackage View
  */
-class HelperConfiguration implements ConfigurationInterface
+class HelperConfig implements ConfigInterface
 {
     /**
      * Configure the provided service manager instance with the configuration

test/ServiceFactoryTest.php

@@ -12,7 +12,7 @@
 
 use Zend\Config;
 use Zend\Mvc\Router\RouteMatch;
-use Zend\Mvc\Service\ServiceManagerConfiguration;
+use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\Navigation;
 use Zend\Navigation\Page\Mvc as MvcPage;
 use Zend\Navigation\Service\ConstructedNavigationFactory;
@@ -48,7 +48,7 @@ protected function setUp()
                 'extra_config'         => array(
                     'service_manager' => array(
                         'factories' => array(
-                            'Configuration' => function() {
+                            'Config' => function() {
                                 return array(
                                     'navigation' => array(
                                         'file'    => __DIR__ . '/_files/navigation.xml',
@@ -81,8 +81,8 @@ protected function setUp()
             ),
         );
 
-        $sm = $this->serviceManager = new ServiceManager(new ServiceManagerConfiguration);
-        $sm->setService('ApplicationConfiguration', $config);
+        $sm = $this->serviceManager = new ServiceManager(new ServiceManagerConfig);
+        $sm->setService('ApplicationConfig', $config);
         $sm->get('ModuleManager')->loadModules();
         $sm->get('Application')->bootstrap();