Merge branch 'hotfix/3327'

Close #3327
Merge branch 'hotfix/3327' into develop

Forward port #3327
Merge branch 'fix-zend-di-definition-list' of git://github.com/neeckeloo/zf2 into hotfix/3329

Conflicts:
	library/Zend/Di/DefinitionList.php
Merge branch 'hotfix/3329'

Close #3329
Merge branch 'hotfix/3329' into develop

Forward port #3329
Merge branch 'master' of git://github.com/foaly-nr1/zf2 into hotfix/3331
Merge branch 'hotfix/3331'

Close #3331
Merge branch 'hotfix/3331' into develop

Forward port #3331
Merge branch 'hotfix/3319' of git://github.com/KeremTubluk/zf2 into hotfix/3333
Merge branch 'hotfix/3333'

Close #3333
Merge branch 'hotfix/3333' into develop

Forward port #3333
Merge branch 'fix/validator-file-sha1' of git://github.com/cgmartin/zf2 into hotfix/3334
Merge branch 'hotfix/3334' into develop

Close #3334
Merge branch 'hotfix/3332' of git://github.com/iwalz/zf2 into hotfix/3340
Merge branch 'hotfix/3340'

Close #3340
Fixes #3332
Merge branch 'hotfix/3340' into develop

Forward port #3340
Use static keyword instead of self for using LSB
Merge branch 'update-code-package' of git://github.com/neeckeloo/zf2 into hotfix/3297

Conflicts:
	library/Zend/Code/Generator/ClassGenerator.php
	library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
	library/Zend/Code/Generator/DocBlockGenerator.php
	library/Zend/Code/Generator/FileGenerator.php
	library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
	library/Zend/Code/Reflection/FunctionReflection.php
	library/Zend/Code/Scanner/ClassScanner.php
	library/Zend/Code/Scanner/MethodScanner.php
	library/Zend/Code/Scanner/TokenArrayScanner.php
	tests/ZendTest/Code/Generator/ClassGeneratorTest.php
Merge branch 'hotfix/3297' into develop

Close #3297
Merge branch 'fix/filter-renameupload' of git://github.com/cgmartin/zf2 into feature/3259