Merge branch 'hotfix/3046' into develop

Forward port #3296
Change RenameUpload filter use_upload_name option default to a safer setting
Revert "Added protected contentTypes array and requestHasContentType function"

This reverts commit 9dfdefbf4c9d695bc0d2125c30571ae37ff95a89.
Merge branch 'master' of git://github.com/julbrygd/zf2 into hotfix/3298
[#3298] Added isPropFind() method

- tests require an is(Method) method for each defined HTTP method constant
Merge branch 'hotfix/3298' into develop

Close #3298
Merge branch 'hotfix/3300' into develop

Forward port #3300
Merge branch 'hotfix/3302' into develop

Forward port #3302
Merge branch 'hotfix/3303' into develop

Forward port #3303
Merge branch 'hotfix/3304' into develop

Forward port #3304
cs fix
Updated requestHasContentType to use the match method of the Accept
header object.

Change-Id: I7e43851c88692b5ea675393719f91d3a4ef379dd
Format source code

Change-Id: I8035798710e17d3e0ec2fdf08fe2d0e1b8086732
cs fix
added methods get[Convert]Encoding() and removed constructor from interface
fixed phpdoc
CS fixes and reverting changes
Minor fixes in the Apache's password adapter
useless conditions
Merge branch 'patch-1' of git://github.com/maxnuf/zf2 into hotfix/3308