Merge branch 'hotfix/2682' into develop

Forward port zendframework/zendframework#2682

src/Service/AbstractNavigationFactory.php

@@ -56,7 +56,7 @@ abstract protected function getName();
     protected function getPages(ServiceLocatorInterface $serviceLocator)
     {
         if (null === $this->pages) {
-            $configuration = $serviceLocator->get('Configuration');
+            $configuration = $serviceLocator->get('Config');
 
             if (!isset($configuration['navigation'])) {
                 throw new Exception\InvalidArgumentException('Could not find navigation configuration key');