Refactor Salt to allow simple usage of pepper

Change-Id: I48e9a85ca0c002311bc6c7331e8167aea888c930
2 files changed