Buildbot upgrades

[Gav...]

Hi All,

I'll be upgrading the buildbot slaves and then the master over the next day
or two.
Expect minimal downtime on each.

Gav...