Merge branch 'upstream' into 1369-integrate-ensure-dependencies-script
1369 - Use explicit revision IDs rather than "tip" for dependencies
1369 - Integrate ensure_dependencies.py with kick.py
1369 - Address issues mentioned during external code-review
1369 - Fix wrong git:* commit id for infrastructure-puppet-concat
1369 - Improve Vagrant(file) dependency hook
Merge branch '1369-integrate-ensure-dependencies-script' into 122-dns-entries
112 - Use of host_aliases to legacy servers