Add a helper function used by the get, put, post, and delete client func...

...tions to merge either 'params' or 'data' request kwargs in with the payload.  Added/updated tests.  This change will make masquerading easier.
Could we use a defaultdict in the places where this is called?