Refactor Orchestra\Html\HtmlBuilder::decorate()

Signed-off-by: crynobone <crynobone@gmail.com>
Trivial changes.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'