Bug 1097380 - Support REBOOT_AFTER_PUPPET on windows; r=dustin
merge default -> production

--HG--
branch : production