OC-5839: PForms support instructive text.  Update to xform generation.  Misc form fixes.