Bug 1096734: remove 'include collectd' temporarily to see if that helps; r=jwatkins
Bug 1096610: Run puppet at boot on windows; r=markco

Uses a scheduled task to run puppet at boot as SYSTEM, creating a
semaphore file just like on Darwin.
Merge default -> production