Merge branch 'cache_tests_cleanup' of https://github.com/marc-mabe/zf2 …

…into hotfix/cache-tests

Conflicts:
	tests/Zend/Locale/Data/CldrTest.php

test/ModuleAutoloaderTest.php

@@ -188,4 +188,5 @@ public function testCanLoadModulesFromExplicitLocation()
         $this->assertTrue(class_exists('My\NonmatchingModule\Module'));
         $this->assertTrue(class_exists('PharModuleExplicit\Module'));
     }
+
 }