trunk-4021

Merge duplicate person attribute types.