Fix an issue with inheritance of placeholder registry. Detected automatically with aop inheritance
Merge branch 'hotfix/3340'

Close #3340
Fixes #3332
Use static keyword instead of self for using LSB
Merge branch 'issue/lsb-inheritance-fix' of git://github.com/lisachenko/zf2 into hotfix/3307

Conflicts:
	library/Zend/Ldap/Node/RootDse.php
Merge branch 'hotfix/3307' into develop

Forward port #3307

Conflicts:
	library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php