Handle ODM document upserts
Test for ODM upserts
Merge pull request #1151 from notrix/master

Handle ODM document upserts