Fix more build dependencies
Merge branch 'master' of github.com:mmckeen/packer-build-templates