cleanup current state of upsert functionality.
Merge pull request #735 from doctrine/fix/upsert-cleanup

cleanup current state of upsert functionality.