TRUNK-4030: locking mechanism for forms
Merge pull request #1011 from rpuzdrowski/TRUNK-4030

TRUNK-4030: locking mechanism for forms