Partial updates when calling createOrUpdate

Fixes #1039 and #1029 

@tgoyne