Merge changes Ie617b76f,I83128ba7

* changes:
  Fix creation of Uri if the lookup key has characters that are not allowed in a Uri
  Create a single VCard file for several contacts Bug:2501468