[FOLD] RIPD-108:  Adjust cert validity

Per discussion with @JoelKatz.

Fold into 163370c789a0446f3e0f85856d7601482d322397.