Merge branch 'cs/zend-di-instancemanager-cs-fixes'
fixes #6952
Merge branch 'cs/#6964-zend-http-request-getcookie-docblock-fixes' into develop

Close #6964
Forward port #6964