Revert "Try to not restart puppetmasters till they're idle"
Revert "Try to not restart puppetmasters till they're idle"

This reverts commit bbb4a6d74587392263e5390d0966ba307c04e10a.

tim-group/stackbuilder,tim-group/stackbuilder