Unify and clean string based merges.
Correct doc blocks.
Merge pull request #4495 from cakephp/3.0-merge

3.0 merge