Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
This is a back-port of rails/rails#6525. See the commit notes there for details.
[ci skip] closes #5790
…f #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
…amoa. Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5)
I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`