Merge branch 'hotfix/get-called-class-changes'

Close #4236
Close #4237
Remove annotation
Merge pull request #4239 from neeckeloo/remove-annotation

Remove annotation in Zend\Db\Adapter\AdapterAwareTrait
Merge branch 'hotfix/4239' into develop

Forward port #4239