TRUNK-3551 Merging Person and Address.  Remove references to commons lang3 from import