TRUNK-4030: locking mechanism for form_id
Merge pull request #876 from rpuzdrowski/TRUNK-4030

TRUNK-4030: locking mechanism for form_id