Fix gen_update_from_array to work correctly with multiple key fields.
BUGZID:
Merge branch 'master' into row-by-row

BUGZID: