TRUNK-4032:locking mechanism for person_attribute_type
Merge pull request #934 from rpuzdrowski/TRUNK-4032

TRUNK-4032:locking mechanism for person_attribute_type