Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair