20820

This is working pretty well in Drupal for Contacts, so I'm submitting a partial ORM change with this PR.  I'll update the remaining ORMs once I get a little further long, but this should be good to merge now.