Bug 1096608: tweak runpuppet.rb to flush output frequently
Bug 1096610: update buildslave startup to wait for puppet
Merge default -> production