salt: qualify site and realm

Change-Id: If081e809b90bb8af304624e639e39b68b9331bf0
Merge "salt: qualify site and realm" into production