Merge change Ifd754059 into eclair-mr2

* changes:
  Make vCard code refrain from using NEIGHBORHOOD field when importing.