Update docs for changes in MergeVariablesTrait.
Update callback docs.
Correct grammar.
Merge pull request #1121 from cakephp/merge-variables-update

3.0 - Merge variables update