Consolidate BR tags.
Merge pull request #5201 from cakephp/3.0-br

Consolidate BR tags.