Merge branch 'hotfix/#6401-paginator-db-select-factory-return-type-fix'

Close #6401
Fixes grammar
Merge branch 'hotfix/#6402-zend-controller-test-grammar-fixes' into develop

Forward port #6402