Generalize the querystring_args for matching for bulk updates

I forgot to add 'retry_on_conflict', which I also need, so I generalized the handling a bit to make it easier to add more. 

Also added a quick test for bulk update.