Merge "Fix HTML output arround HTMLForm's submit buttons when in vform"