Merge "a.t.f.DateFormat behaves consistently with j.t.DateFormat in en, en-US locale"