Various fixes to the markup generated for embedded subforms
Merge branch 'master' into new-ui