Unify templated tags.
Fix tests
Merge pull request #5195 from cakephp/3.0-templates

Unify templated tags.