Fix Bug #1380734 Batch upsert into salted table

Change-Id: I08a0296a8af41a13272676b99b1bf7a50a763d5e
Merge "Fix Bug #1380734 Batch upsert into salted table"