am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable

Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable