Test case to check for conflict
Some refactoring to allow BasicDocumentRevision to convey attachments
Fetch attachments into DocumentRevisions:

Passing AttachmentManager to getFullRevisionFromCurrentCursor feels a bit wrong but it's the easiest
way to do things without a massive refactor.