Merge branch 'hotfix/code-generator-test'

Fixes failing test due to docblock addition
Fix 4231
Merge pull request #4328 from bakura10/fix-4294

Fix 4294
Merge branch 'hotfix/4328' into develop

Close #4328
Fixes #4294
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