Fix test never ran because 2 setExpectedException in the same test
Merge branch 'hotfix/#6047-enable-zend-test-controller-tests' into develop

Close #6047
Forward Port #6047