More updates to buildbot master to do a clean on request

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>