Do not reset $id if found

- Pointed out by andrer in #zftalk.dev
Write test for HEAD behavior with identifier

- Wrote test to prove that HEAD is being called with identifier when
  found; failed before change, and works afterwards
5.3.3 compatibility
Resolved several unit test failures, more 5.3.3 compat, updated tests
Merge branch 'master' of https://github.com/zendframework/zf2 into hotfix/session-container-array-object
Merge branch 'master' of git://github.com/gag237/zf2 into hotfix/3608
Merge branch 'hotfix/3608'

Close #3608
Merge branch 'hotfix/3608' into develop

Forward port #3608
Merge branch 'patch-10' of git://github.com/Slamdunk/zf2 into hotfix/3610
Resolved additional 5.3.3 failures, resolved issues introduced to > 5.3.3 versions
Merge branch 'hotfix/3610'

Close #3610
Merge branch 'hotfix/3610' into develop

Forward port #3610
Added translations for Zend_Validator_File_UploadFile
Merge branch 'master' of git://github.com/wryck7/zf2 into hotfix/3618
Merge branch 'hotfix/3618'

Close #3618
Merge branch 'hotfix/3618' into develop

Forward port #3618
Merge branch 'changelog-bc' of git://github.com/cgmartin/zf2 into hotfix/3622
Merge branch 'hotfix/3622'

Close #3622
Merge branch 'hotfix/3622' into develop

Forward port #3622
Merge branch 'relative-links' of git://github.com/Maks3w/zf2 into hotfix/3627