Consolidate BR tags.

Follow up on https://github.com/cakephp/cakephp/pull/5195