Merge branch 'hotfix/#6718-zend-db-depends-on-zend-stdlib'

Close #6718
Fixed the call to addBranch() to include $branchName
Reproducing test case for #6797
Removed \r\n str_replace (no \r in these files)
#6797 - add missing `@group` annotation for new test, removing unused carriage return character removal `str_replace()` call
Merge branch 'hotfix/#6797-zend-config-xml-handle-numeric-branch-names' into develop

Close #6797
Forward port #6797