Merge branch 'hotfix/#6797-zend-config-xml-handle-numeric-branch-names'

Close #6797
Fixed annotations on Zend\Db parts
Forgot a ;
Fix interface that cannot reference self, and creating mocks that expect certain set of methods
Fix interface that cannot reference to self
#6798 - reverting BC break in `AdapterInterface` (added method cannot be added in 2.x)
#6798 - removing unused imports
Merge branch 'hotfix/#6798-fix-zend-db-docblock-annotations-as-per-scrutinizer' into develop

Close #6798
Forward port #6798