Merge branch 'hotfix/code-generator-test'

Fixes failing test due to docblock addition
Changed default version service to Zend.
Merge pull request #4331 from glen-84/bugfix/default-version-service

Changed default version service to Zend.
Merge branch 'hotfix/4331' into develop

Close #4331