Forward port zendframework/zf2#5672
Forward port zendframework/zf2#5672

Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php

zendframework/zend-uri,Maks3w/zend-uri,researchgate/zend-uri