Bug 982070: switch time servers; r=arr
Merge default -> production

--HG--
branch : production