remove hardcoded salt command timeout, replace with option

Change-Id: I874450bfdbd46ef5c88b552b94de4c5954067bf9