Merge latest patch sent to dev mailinglist with subject "XCAP tests" which represents the work of Grigorii Balutsel on the "XCAP Support" GSoC 2010 project into trunk. Fix merging already existing contacts with serverside list and storing password in credential service.