Merge branch 'master' of github.com:salt-formulas/salt-formula-linux

Change-Id: I5468d69c362cbd2e71a064bd2bc89f843fbefe7e