Temporarily disable multi-master salt

Change-Id: Ie3c8426ac2a19175580c1b4d26faa5e0eab4ded1
Merge "Temporarily disable multi-master salt" into production