Merge branch 'develop' of github.com:salt-formulas/salt-formulas-scripts into develop

Change-Id: I0d5a1ca39d78601810094f172929c4f0f8492478