Fix di, testing if definition list has method
Update unit tests
Merge branch 'hotfix/3327'

Close #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' into develop

Forward port #3329