Bug 1073317: remove OnDemand from puppet-periodic.plist; r=bhearsum
Merge default -> production