TRUNK-4030

fix for [TRUNK-4030] locking mechanism for form_id