Corrected some grammar in the JsonView class doc blocks
Updated doc block for JsonView's subDir property
Merge pull request #1650 from bcrowe/fix-jsonviewdocs

Corrected some grammar in the JsonView class doc blocks
Update docs for HttpSocket methods.

delete() uses the request body, not the query string.
Updated CakeTime::i18nFormat() doc block description
Merge pull request #1652 from bcrowe/fix-caketimedocs

Updated CakeTime::i18nFormat() doc block description
Fix casing of validation rules in bake
Merge pull request #1656 from dereuromark/master-validation-rules-casing

Fix casing of validation rules in bake
Fixed TreeBehavior::recover() when using scope. Fixes #4062.
Merge pull request #1657 from ADmad/bugfix/tree

Fixed TreeBehavior::recover() when using scope. 

Fixes #4062.
simplify tests
add missing create() for creating a new record.
Merge pull request #1658 from dereuromark/master-tests

correct and simplify tests
Use array_key_exists instead of isset()

This allows contains() to work with null values.

Fixes #4083
File::replace()

Searches for a given text and replaces the text if found
Merge remote-tracking branch 'upstream/2.5' into 2.5