Merge pull request #5493. Fix #5126 in develop
Merge pull request #5493. Fix #5126 in master
Removed the code retranslating messages
Removing the unit tests
Add a check for aliases when checking for circular dependencies. If aliases are used, assume the dependencies aren't circular unless the same alias is used multiple times.
Fix bug in InjectTemplateListenerTest

InjectTemplateListener in tests yields different results with
ModuleRouteListener::MODULE_NAMESPACE router parameter set.

Fix applies ModuleRouteListener to routematch parameters.
Add controller namespace prefix to template mapping

InjectTemplateListener changes behaviour when controller is matched by
map entry.  Mapped namespace prefix is replaced with provided value and
rest of the controller inflected. If map entry value is boolean true,
then whole controller class is inflected. In all cases\Controller\
namespace and trailing Controller are stripped.

Most notable use case is when module name is not top level namespace

With map entry 'Vendor\Module' => true and controller class
Vendor\ModuleName\Controller\FooController resulting template name will be
vendor/module-name/foo/action-name
Merge pull request #5406 from DASPRiD/bugfix/mvc-translator-wrapper

Make I18n component completely optional for Mvc
[#5406] Logic and order-of-ops cleanup

- Prefer the MvcTranslator service over the translator service
- Applied object calisthenics and removed nested conditionals
Merge branch 'feature/5406' into develop

Close #5406
Fixes #5108
Merge pull request #5186 from dol/bugfix/missing-servicemanager-dependency

Minor bugfix: Added missing composer dependency (ServiceManager) to Math package
[#5186] incorporate feedback

- Moved servicemanager to suggested dependency
- Added ext-bcmath and ext-gmp as suggested dependencies
Merge branch 'hotfix/5186'

Close #5186
Merge branch 'hotfix/5186' into develop

Forward port #5186

Conflicts:
	library/Zend/Math/composer.json
Merge pull request #5255 from youngguns-nl/getChildrenByCapture

Get ViewModel children by capture
Merge branch 'feature/5255' into develop

Close #5255
Add more tests that highlight a regression in the new circular dependency check for aliases
Change alias check to pass additional tests
Merge pull request #5364 from ronan-gloo/develop

Add Naming strategy for Hydrators
[#5364] Simplify conditional

- we know we have a boolean; remove true === test
- combine if statement from body with else parent