Bug 1051558: whack Apple's ntpd hourly to keep it working; r=bhearsum
Merge default -> production