Tests for #6363

https://github.com/zendframework/zf2/issues/6363
Fix for #6363

https://github.com/zendframework/zf2/issues/6363
added license comment in test file
fix spaces (?)
fix spaces
small code change

Small code change accoording to @adamlundrigan suggestion. It make the
code smaller and more logical, and the result is the same.
Merge branch 'hotfix/6295'

Close #6295
Fixes #6143
Merge branch 'master' of https://github.com/ant7/zf2 into ant7-master
Merge branch 'ant7-master' into develop