more work on CRM-12463, form building js fixes
Merge pull request #617 from kurund/CRM-12463-fixes

more work on CRM-12463, form building js fixes