Fix two 'bugs' in unit tests:

 1) if we try to fake a resource, really behave like a resource and
    disable revision check when writing back the remote id of an item
    (otherwise this will trigger local-remote conflicts)
 2) disable the automatic conflict handling when testing local-local conflicts

svn path=/trunk/KDE/kdepimlibs/; revision=1159923