Merge pull request #933 from rpuzdrowski/TRUNK-4032

TRUNK-4032: locking mechanism for person_attribute_type
TRUNK-4032:locking mechanism for person_attribute_type