Revert "Merge branch 'ZF-3347' of git://github.com/Deserved/zf2 into hotfix/3424"

This reverts commit b9d19770186be6b50e9908c94d495db42034f6df, reversing
changes made to 054f7a0f95bb919cce95faa53ced0a525017602f.

Reverts #3424 due to BC breaks reported in #3576

Conflicts:
	tests/ZendTest/ServiceManager/ServiceManagerTest.php