Merge branch 'hotfix/4934'

Close #4934
https://github.com/zendframework/zf2/issues/4952
Fix for my own issue on datas not mapping to underscore uppercased class
Merge branch 'hotfix/4966' into develop

Forward port #4966