Fix for GitHub issue 3469

Fix with amended integration tests (where present) - https://github.com/zendframework/zf2/issues/3469.