resolving #2519

setting opts.remove to false if opts.upsert resolves to "true"
Merge pull request #2520 from benkroeger/master

resolving #2519