Merge pull request #17047 from betesh/master

Time includes DateAndTime::Zones acts_like(:time)
Conflicts:
	activesupport/lib/active_support/core_ext/time/zones.rb