OK, so what makes you think the next one won't be till 2020? Leap seconds aren't like leap years, they're unpredictable, since the Earth's rotation varies in response to geological events etc. The IERS announces them six months in advance.
But as an R programmer I went back and ran the numbers and it's looking like 2020. Happy to see that my Mark 1 Eyeball estimate was close. But I'm happy to see what your numbers are.
With the advent of the Raspberry Pi support for time and the cheap GPS units, I run my time locally. See https://blog.ntpsec.org/ for details.
And yes, I cleared the second change, but I in full disclosure it wasn't until 9 AM before I checked.