Merge branch 'cs/#6789-removing-duplicated-inherited-aggregate-listener-logic-in-view-manager'

Close #6789
Fixing braces in `CommonAdapterTest` (crashing travis builds)
Merge branch 'cs/zend-test-braces-fixes' into develop