Issue 1398 - Improve compatibility with older git(1) versions
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into 122-external-node-classifier
Travis - Allow both exit code 0 and exit code 2
122 - Ensure Ubuntu versions of puppet packages are used even if the Puppetlabs archive offers alternatives
Merge remote-tracking branch 'upstream/122-external-node-classifier' into 122-dns-entries