Backport of Zeam htmlAttributes and Field refactoring