am cf8de265: Merge "Teach the DateFormat test that we\'ve deliberately broken \'k\'."

* commit 'cf8de26532f0ac5d4322e0adf0a749b2b5e5b979':
  Teach the DateFormat test that we've deliberately broken 'k'.