Generalize the querystring_args for bulk, so it is easier to add more options

At the same time add support for retry_on_conflict and add a test case for bulk update
Merge pull request #341 from holm/master

Generalize the querystring_args for matching for bulk updates