[#5650] CS fixes

- trailing whitespace
- s/@return Menu/@return self/ throughout
[#5650] Test fix

- including test asset files often results in additional whitespace at
  end of string; updated assertion to trim() first.
Merge branch 'feature/5650' into develop

Close #5650
Merge pull request #5670 from Xerkus/feature/controller-to-template-map

Add controller namespace prefix to template mapping

Conflicts:
	tests/ZendTest/Mvc/View/InjectTemplateListenerTest.php
[#5670] CS fixes

- Added docblock
- Fluent interface
Merge branch 'feature/5670' into develop

Close #5670
Merge pull request #5702 from turrsis/feature/stdLib-PriorityList

Stdlib - PriorityList move from Zend\Mvc\Router to Stdlib
[#5702] Make Router\PriorityList extend Stdlib\PriorityList

- to remove duplication
Merge branch 'feature/5702' into develop

Close #5702
Merge pull request #5711 from nicktacular/console

Implemented writeTextBlock method in Zend\Console\Adapter\AbstractAdapter
[#5711] CS fixes

- space after opening comment
- removed a conditional by rephrasing and returning in the conditional
  body
Merge branch 'feature/5711' into develop

Close #5711
Merge pull request #5713 from nicktacular/getopt

Adding Zend\Console\Getopt option callback hooks
[#5713] CS fixes

- One argument per line on multi-line function calls
- @return self (instead of \Zend\Console\Getopt); performed throughout
  class for consistency
- Removed all @return void and @return null annotations
- Relative namespace qualification for all @throws annotations
Merge branch 'feature/5713' into develop

Close #5713
Merge pull request #5719 from heiglandreas/feature/makeCollectionConfigurable

Feature/make collection configurable

Conflicts:
	library/Zend/Form/View/Helper/FormCollection.php
	tests/ZendTest/Form/View/Helper/FormCollectionTest.php
Merge branch 'feature/5719' into develop

Close #5719
Merge pull request #5720 from mtymek/hotfix/5671-console-routing

Fix #5671 - console routing not correct

Conflicts:
	library/Zend/Mvc/Router/Console/Simple.php
Merge branch 'feature/5720' into develop

Close #5720
Fixes #5671
Merge pull request #5730 from blanchonvincent/hotfix/zend-test-reset-persistence

Zend\Test Fix persistence with multi dispatch