Merge branch 'hotfix/3480'

Close #3480
Fixes #2538
Update library/Zend/Code/Generator/PropertyGenerator.php

DocBlockGenerator::fromReflection Accepts DocBlockReflection but string given
[#3491] Added test

- Added test to demonstrate that docblock for property is now retrieved
Merge branch 'hotfix/3491' into develop

Forward port #3491

Conflicts:
	tests/ZendTest/Code/Generator/PropertyGeneratorTest.php