Fix persistence with multi dispatch
Merge pull request #5730 from blanchonvincent/hotfix/zend-test-reset-persistence

Zend\Test Fix persistence with multi dispatch
[#5730] CS fixes

- Trailing whitespace
Merge branch 'feature/5730' into develop

Close #5730