Merge branch 'master' of https://github.com/aboe76/packer_salt-states_testing