[#3296] CS fixes

- trailing whitespace
cs fix
Merge branch 'hotfix/3046'

Fix #3046
Close #3296
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/3299' of git://github.com/postalservice14/zf2 into hotfix/3300
Merge branch 'hotfix/3300'

Close #3300
Fixes #3299
Merge branch 'hotfix/3300' into develop

Forward port #3300
Merge branch 'zf3282' of git://github.com/youngguns-nl/zf2 into hotfix/3302
[#3302] CS fixes

- Removed unnecessary extra lines
- Removed a docblock used for IDE typehinting
Merge branch 'hotfix/3302'

Close #3302
Fixes #3282
Merge branch 'hotfix/3302' into develop

Forward port #3302
Merge branch 'hotfix/fix-indentation' of git://github.com/localheinz/zf2 into hotfix/3303
[#3303] More CS cleanup

- (bool) instead of (boolean) (consistency)
- space after type casting operators
Merge branch 'hotfix/3303'

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

Forward port #3303