Added an entry for 2nd Buildbot slave node, so the setup script doesn't scream
Merge branch 'master' into linaro