Don't return deleted docs for conflicts

Don't return deleted docs for conflict resolution. Deleted documents are not normally
in conflict, in CDTDatastore conflict resolution does not return deleted leaves.

Modify test which expects a winning rev to be deleted to expect no rev provided as
a conflict is deleted.
I think you need to put these in ``<p> </p>`` paragraphs or it won't come out as separate paragraphs - but have a look at the javadoc output to make sure