CRM-12357 upgrade part
CRM-12463, formRule js fixes
Merge pull request #632 from kurund/CRM-12463-fixes

CRM-12463, formRule js fixes
Merge pull request #635 from pratik-joshi/CRM-12357-upgrade-part

CRM-12357 upgrade part
Merge pull request #631 from yashodha/soft

CRM-12463
more work on CRM-12463, fixed api for backward compatibility
Merge pull request #636 from kurund/CRM-12463-fixes

more work on CRM-12463, fixed api for backward compatibility
CRM-12463